Merge branch 'develop' into test
Merge branch 'develop' into test
Merge branch 'hotfix/map-equality' into test
Re: #1432 - added new config property
Merge branch 'ticket-1432-backend-translations' into develop