Feature/dsp 1228