dm-sp-23 #584