dm-sp-24 #484