r20639: Commit part 1 of 2.