#JC-1565 - Added localization