fix CLDCONNECT-1691