copy around object changes
copy up changes
top-level checkin for button groups
update comments, white space
copy up changes
copy down changes