Merge branch 'fenghaitao-guard_x86' into develop