Merge "Account for null client certificate"