Merge branch 'misc-5.2' into next-fixes