fixes #2396 Popups show escaped HTML(cherry picked from commit 371c2e864dc1671046514a7bcaee22097d3e05f1)
fixes #2396 Popups show escaped HTML
(cherry picked from commit 371c2e864dc1671046514a7bcaee22097d3e05f1)