Port Bug 1002593 to v1.4