Update UPGRADE file
Update ChangeLog