Sync to trunk revision 63875.