upstream: e733e65472186b2067abe92088c26a62d2332b06