Add upstream dependencies
Merge upstream changes