SSP-2779 Work in progress