This (hopefully) concludes a series of merge-requests to get the code to deal with HV-adjustments working properly in release 22.0.