Merge "Separate Image v2 members client"