HV-725 Chapter 5 - XML config changes