Merge branch 'hotfix/4053'
Close #4053
* hotfix/4053:
  Implement better text domain merging support
Fix loading of a text domain from different sources
Merge branch 'hotfix/4085' into develop

Forward port #4085