Merge pull request #965 from avpinchuk/fix-memory-leak-in-per-thread-context

Fixes memory leak in per-thread context