Merge "Handle v2 resources in client state"