sync to trunk revision 36700