dm-sp-24 #1636