upstream: fea973d923cafb504cdca781c77fb782553d1459