SSP-1116 fixed multiple issues