Backport of bug #342852
6 files changed