dm-sp-22 #628