Upstream 4.25