upstream: a1463fbaff05ffa3bc7938bea3ac67ffd685e678
