[SWITCHYARD-1705] - Localization changes