Merged fix for bug 86773 from trunk