CON-804 | minimalize flash of content