Merge branch 'misc-7.4' into next-fixes