CDB-2743
Merge CDB-2743 into release/2.13.2