Updated version

Update from upsteam and cherry-pick our changes