fix problem on TeamBenchmark and fix some compilation errors
Merge branch 'feature/teambench' into develop