CDB-1540 fixed thanks to Demimismo
Merge CDB-1540 into release/2.10.1