Merged fix for bug 86137 from trunk