upstream: c7e484eee1f383a212c03b44c028c0b8052ce797
