dm-sp-23 #608