support more threads
Merge remote-tracking branch 'origin/macan' into zhaoyang