Merge branch 'next/soc' into HEAD