platform-quirks.diff upstream-bd29a48b56.diff upstream-PR-3860.diff