Sync with trunk revision 63128.