Updated patches to trunk revision 35249