SSP-755 Initial commit