CDB-2073 Fix connection closing
Merge branch 'CDB-2073' into release/2.11.1