Merge pull request #9480 from neheb/soc