Merge branch '5237-unified-layout-common-renderer' of github.com:merm…

Merge branch '5237-unified-layout-common-renderer' of github.com:merm… #10834