Merged fix for bug 87257 from trunk