upstream revision: 3cce3790072249cbe51b96cea26bc78019c11fd0
upstream commit 1931d3cb20a00da732c5210b123656632982fde0