9 Commits (revert-217-fix_reported_errors)