Merge "Support v3 in credential providers and subclasses"