case 3083 - Avoid adding format classes after page load.
Merge branch 'case-3083' into develop