Merge to upstream revision 1142