Fix empty user model start bug
Merge remote-tracking branch 'upstream/develop' into develop
Merge branch 'develop' into calendar-debug