Merge pull request #12906 from Tithen-Firion/clean-html-fix