Backport from trunk.