Merge branch 'spear/multiplatform' into next/multiplatform