Sync'ed with master.