final checkin for this branch, capturing changes during testing