Merge "Fix CredentialManager for use_resource_processor: true" into main