Merged status and X509 updates branch into master