Fixed 10819

:: upstream revision 10826 ::