Merge branch 'soc-part2' into soc