Merge latest upstream changes.