Sync with trunk changes.