DSP-1961 fix compilation errors after merge