dm-sp-24 #594