Merge upstream package changes