Manually merged with master.