Fix display glitches on startup linked to the xmlEntities operation applied before outputting xml.
Merge remote-tracking branch 'origin/develop' into develop