Merge "Merge pointer/tts categories into one without heading" into oc-dev