dm-sp-25 #869