ENG-4929 passes some initial tests after join and union rework.