Sync fork with trunk

New sync.