AS7-6665 Updating to HV 5.x