Update x509 for 6.2 and patch 7.4.1