dm-sp-24 #1630