Update with latest upstream changes