Merged fix for bug 86213 from trunk.