fixed CDB-2106
Merge CDB-2106 into release/2.11.2