Redirection from user edit page
Merge branch 'master' into FixRoutes
Merge branch 'FixRoutes'