dm-sp-24 #797