Merge branch 'drivers-platform' into release