Merge "Add ClientCert support"