SSP-2195 merge changelog
SSP-2195 merge changelog