Add method to clear context from thread storage.
Merge branch 'master' into develop