Drop and replace Summary2 with Kevin's changes from master.
This was done with 'cp', not with cherry picks.