Merge branch 'hotfix/1337-fix'
Merge remote-tracking branch 'origin/pr/1339'

Close #1339
Fixes #1338
Merge branch 'hotfix/#1340-fix-#1246-incorrect-translator-api-in-view-helpers'

Close #1340
Close #1246
Updated old documentation
Merge remote-tracking branch 'origin/pr/1347' into develop

Forward port #1347