Merge branch 'for-next/entry-s-to-c' into for-next/core