Merge "Introduce scope in the auth API"