Partial merge with master.