dm-sp-22 #1630