Merge branch 'drivers-for-4.20' into all-for-4.20