Fixed DDC-2506 by manually updating code. Closes PR #708.
Merge branch 'DDC-2506' into 2.4