CDB-1604 bugfix
Merge CDB-1604 into release/2.13.0