SSP-2828 WIP Hopefully close to a final version