[2.3] - WIP combos and categories

See discussion on #11374