CON-804 | remove escaping opportunity
CON-804 | minimalize flash of content
CON-804 | Commenting out file
Merge remote-tracking branch 'origin/CON-804' into CON-806