Merge branch 'bw/union-merge-refactor' into next