Merge branch 'dev', remote-tracking branch 'origin' into dev
- Clear wait timer
- Updated TODO
thread terminate should kill children of child thread too
Updated TODO