dm-sp-24 #1588