Merge pull request #4181 from yegorich/libsoc