Merge pull request #15835 from BruceForstall/FixGCKeepAlive