Merge branch 'hotfix/4013'

Close #4013
Implement better text domain merging support
Merge branch 'hotfix/4053' into develop
Close #4053

* hotfix/4053:
  Implement better text domain merging support