Fix DDC-2409
Simplify condition of previous commit (5cdc73e)
Merge branch 'DDC-2409' into 2.3