=pro #15616 UTF-8 charset and exception with offending file (for Validation)
Merge pull request #15623 from ktoso/port-15616-master-ktoso

=pro #15616 UTF-8 charset and exception with offending file (for Validation)