upstream commit: 814556d
