Merge upstream changes

Merge more upstream changes