CDB-1787 fixed
Merge CDB-1787 into release/2.10.0