Further extraction of accidental merge from master.