* Sync to trunk r63845.