Port changes for SciFi to magnet up upgrade
Propagate changes that have been put in upgrade/master after tag sim-20171127-md (i.e. MR !6 (merged)) to magnet up branch
Propagate changes that have been put in upgrade/master after tag sim-20171127-md (i.e. MR !6 (merged)) to magnet up branch