Merge branch 'late/soc' into devel-late