dm-sp-24 #567