Added localization for Orchestra
Merged changes