dm-sp-24 #618