Merge pull request #3546 from JulianBailey/master

SContext is remaps to HContext when in VSMode
8 jobs for master
in 0 seconds and was queued for 109 minutes and 36 seconds