upstream: 0efed9003fb6c920d404928776fc9a400bb78560