Merge latest upstream changes