JAL-2679 reinstating changes lost in VCF merge