dm-sp-21 #636