Re: #1703 - fixed
Merge branch 'ticket-1703-translations' into develop
Merge branch 'develop' into test