SSP-2833 WIP. Fallout from reorg