Backported fixed for bug 189931.
2 files changed