dm-sp-23 #1669