upstream: d8db499463129e820be4d8a23485055f60abb139
