Merge pull request #6959 from charris/backport-6958

Backport 6958