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