assert bug with multi-thread solved, but it's a intrusive solution...
Merge remote-tracking branch 'origin/master'