r20640: Commit part 2/2