fix CurrentThreadVariable
Merge branch 'CurrentThreadVariable'