[#37746913] another attempt at fixing this amazing bug
Merge branch 'fix_for_the_distributions_bug' into user_can_view_site_in_3_lngs