[11.x] Add the ability to limit scopes by client (#1682)

[11.x] Add the ability to limit scopes by client (#1682) #55