Merge upstream and other stuff