Sync to trunk revision 63857.