Apply latest upstream changes