Upstream commit f41c536ff3