CLDSVCS-655 add to 6.1.x
CLDSVCS-655 update