upstream commit 11