Merge "Localization clarifications"