Merged fix for bug 86199 from trunk