fix_union-49
Merge branch 'feature/fix_union_locale-49' into staging