fix-886673-with-upstream-commit.patch
