Merge branch 'spear/multiplatform' into late/cleanup