Merge branch 'change_edit_user_from_roles'