Backport of rev. 57904
2 files changed