HHH-8218 - Upgrading to BV 1.1.0.Final and HV 5.0.1.Final