dm-sp-23 #828