Upstream merge.