Merge branch 'bg/apply-fix-blank-at-eof' into maint