Merged fix for bug 87350 from trunk.