Merge changes to localization.