dm-sp-22 #588