Merge tag v3.9-rc1 into for-3.9/upstream-fixes