upgrade/master merge with upgrade/magup for VP Calibration
For creating the magup version of the tag with upgrade/sim-20201028-vc-md100 for including VP calibrations
For creating the magup version of the tag with upgrade/sim-20201028-vc-md100 for including VP calibrations