upgrade/master merge with upgrade/magup for VP Calibration

Sajan Easorequested to merge
upgrade/master into upgrade/magup

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

Merge request reports