Fixed DDC-2235.
Merge branch 'DDC-2235' into 2.4