upstream: 8e6bb72d4382b9b22302c7cbf403ded8008b3470
