upstream: 5669aca4a3fc5ea17525a7fcef5cf5444d99aaff