dm-sp-24 #436