Upstream 3.4