Merge pull request #1272 from Proplex/new-branch3

Add /soc/ support