close the oos ois and soc.
Merge branch 'master' into jianw_dev