Reorganize deletion of models
Merge branch 'master' into builds
7.265