Merge pull request #8982 from jflyper/bfdev-register-eol-code-changes-for-html