Issue #1207
CDSP fix and release