upgrade/master merge with upgrade/magup for the RICH property input updates

Sajan Easorequested to merge
upgrade/master into upgrade/magup

magup version of upgrade/sim-20201030-vc-md100 for the updating the RICH property input updates

Merge request reports