upstream: cc174d4d70d350834dbe6c5fafad4bbc9ce3756b
