Apply fix from bug 363451
18 files changed