Merge branch 'develop'
fix issue in performance test programs
Merge branch 'master' into develop