sync to trunk revision 36500