CDB-1957 Fixed
Merge CDB-1957 into release/2.11.0