Merge branch 'kh/commentchar-config-error-message'