Merge pull request #7624 from haskell/gb/expose-more-global-flags