Add after scope on users
Merge branch 'master' into stable