Merge "Separate Image v1 members client"