dm-sp-24 #1821