Merge branch 'milbeaut/newsoc' into arm/newsoc