dm-sp-25 #587