Add upstream changes
Bump version