Merge branch 'wip/stacked-overlay' into preview