Merge branch 'next/drivers' into late/multiplatform