Apply changes from Integration to Master - localization

Part of #687 (closed).

Covers changes made during the integration period to the localization packages.