Merge pull request #11650 from AdmiralCurtiss/more-system More passing of System instead of using the singleton.
