Resolved CLDCONNECT-1044