upstream-cross-platform-fixes
