Upstream to 3.0.101