fix DDC-2579
Merge branch 'DDC-2579' into 2.3