bug 1049790 - v1.4 specific patch.
Merge pull request #23113 from nullaus/v1.4

bug 1049790 - v1.4 specific patch.