Changes to Vendor (Cleaning up cherry-picks & beer version etc)