Merge remote-tracking branch 'akrabat/feature/layout-consolidation'