Merged fix for bug 86176 from trunk.