Um this was suppose to not be master since this hotfix turned out to be huge
remove dpm