Merge: Fix behavior with unions
#1327
+32
−6
Merged