Merge branch 'APD-228' into develop
APD:228: Updated i18n texts