upstream commit 5