Committing fix for CLDCONNECT-1121