* Sync with trunk r64401.