implementing CLDCONNECT-1020 and CLDCONNECT-1082