Merge "[CDS] Correct connection configuration to sdnc"