Merge branch 'ms/maint-config-error-at-eol-linecount' into maint