dm-sp-24 #337