Upstream 3.0.44