Upgrade to new dmsf
#18677
#18677