add the categories, do not replace them, at merge time
Merge remote-tracking branch 'origin/1.12'