Merge branch 'ef/non-ascii-parse-options-error-diag' into maint