upstream: 345da84d875becd82120ac159d86acc3b40921f1
