Merge pull request #12479 from AdmiralCurtiss/globals-setdisc Core/Boot: Avoid global system accessor when setting disc.
