Merge pull request #17987 from nullaus/v1.4

Merge pull request #17303 from nullaus/bug982006