upstream commit f3f67b7