Merge "Revert "Fix prevent defect for locales"" into devel_3.0_main