Théo Daron

Results 11 issues of Théo Daron

This fixes #2900 by simply saving term info and registering an on-exit handler to put correct term info back at the exit