More tweaks for design v2 [#49717623]
Merge branch 'feature-49717623-Convert_pages_to_designv2'