Committing fix for CLDCONNECT-1042