Check-in new changes from upstream