fixed CDB-1915 client side
Merge CDB-1915 into release/2.11.0