Merge branch 'ticket-1767' into develop
Re: #1432 - fixed
Merge branch 'ticket-1432-backend-translations' into develop
Merge branch 'develop' into test