Merged fix for bug 87029 from trunk