fixes html tag being displayed #2353
Merge remote-tracking branch 'origin/staging' into staging