Add TLS and x509 helpers
Merge forward