Adding fix and tests for DDC-1734