per_thread scope
concepts refactor
style
concepts ut fix
per_thread scope