Fixing the issue with a model type without a namespace.
Merge branch 'release' into release_fixes
Merge branch 'release' into dev