Merge branch 'wip/stacked-overlay'