Merge pull request #17607 from nullaus/bug981764

bug 981764