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