Merge "Use scope in v3 identity client"