localization related commits