Merge branch 'hotfix/2.0.5'
ModelControllerTest with user.
Merge branch 'hotfix/2.0.6' into develop