Upstream-Hotfix