ModelControllerTest with user.
Merge branch 'hotfix/2.0.6'