SSP-950 fixes required to support added properties