Merge "Remove duplicated identity v2 clients"