Updates based on merge with master.