force str() before merge context into os.environ
Merge branch 'feature/context-hooks' into work

* feature/context-hooks:
  force str() before merge context into os.environ