Merge branch 'zhaozigu-fix-compile' into develop