Merge branch 'multiplatform/platform-data' into next/multiplatform