Sync code with trunk.