Backport bug fix for SF bug report #1546372.
2 files changed