Merge pull request #17607 from nullaus/bug981764

bug 981764
Merge pull request #17764 from nullaus/v1.4

V1.4