Update with upstream changes