i18n fixes
Merge branch 'hotfix/v1.61'
Merge tag 'v1.61' into develop

v1.61