Merge "Fix V3 credential behavior, documentation"