Merged fix for bug 86564 from trunk