Merge branch 'master' into osx_zuffy
Merge branch 'master' into osx_zuffy

update swc.
Merge branch 'master' into osx_zuffy
clean the code only.