[USE] Merge the categories S and O
5 files changed