dm-sp-23 #329