Backport of r68150
2 files changed