fix compile warning
Merge branch 'develop' into threadtrace