SSP-1560 - missed in last checkin for this ticket