Upstream merge
Update our patches for upstream changes