Merge "Make credentials_factory a bit nicer"