Merge status and X509 updates branch