Merge pull request #9101 from lodr/bug-859898-remove-innerHTML

Bug 859898 - All unsafe / unnecessary innerHTML
Cause r+(cherry picked from commit 52f1125f4af3a85e72cf1b1423a5e627df86dfed)