Resolve L2SS-239 "Add waveform cp/mp to sdp device" Closes L2SS-239 and L2SS-241 See merge request !105