Update to latest upstream changes