Implement better text domain merging support
Merge branch 'hotfix/4053'
Close #4053
* hotfix/4053:
  Implement better text domain merging support