Merge "Apply string localization" into devel_3.0_main