Merge pull request #2974 from markscott-ms/fix/2959-global-access-get-guard