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