dm-sp-24 #718