Merged refactored x509write module into development