Backport fix for bug #1643943.
3 files changed