Merge branch 'fix/use-union-all' into 'develop'