Merge pull request #3249 from harfbuzz/use-merge-s-o

[USE] Merge the categories S and O