Merge "ThreadInfo- use explicit rather than void pointers"