dm-sp-24 #578