Backport patch #1643738.
2 files changed