Merge branch 'next-misc' into next

More misc changes