[fix] data racing elimination
Merge branch 'master' into gh-pages