Fix DDC-2252
Merge branch 'DDC-2252' into 2.3