Merged X509 refactoring into development