Merge branch 'misc-7.0' into next-fixes