Merge branch 'develop' into refactor/user-view