sync to trunk revision 36100