backport ece96f6 to 1.4-branch