Re-patching a few things lost in a previous change to MGC
A few changes were lost in !75476 (merged) unintentionally. Adding them back in here. Thanks @ljerala for pointing out the problem.
A few changes were lost in !75476 (merged) unintentionally. Adding them back in here. Thanks @ljerala for pointing out the problem.