Merged fix for 87744 from trunk, using revision 5566.