Upstream 3.0.95