Merged fix for bug 86112 from trunk