Added handling for RIV version, client certificate.