bisect: cdfa487978bcbd4a540ea6c2b8ef156374c0bb0a 1/3
Merge from master.