Merge remote-tracking branch 'upstream/patch_cert_regexp' into main