Merge "Use safe_union correctly"