Merge branch 'for-next/misc' into for-next/core