Backport of revision 62648
3 files changed