Merge upstream with my fork