SSP-1669 Hopefully last commit. Expect this to be rebased