upstream: c9a1cb97473bb77fe4259d81a739f64e7f8ad167