Merge branch 'shareable-layout'