Merge branch 'feature/new-user-routes' into 'develop'