Merge pull request #17964 from nullaus/bug981539

bug 981539