Merge "Change v2 identity client methods to return one value"