Sync with trunk revision 64099.