* Merge relevant changes with upstream.

