fixed merge error within connection_secureChannel branch