Upstream: 3.0.46