upstream commit 91632c8ac97fa3daffe4ff8f1391735b5d6805e6
upstream revision: 3cce3790072249cbe51b96cea26bc78019c11fd0