Merge branch 'omap/multiplatform-fixes', tag 'v3.8-rc5' into next/multiplatform