Add a context value to transport to make the implementation less stateful
Merge branch 'feature-redo-transport-to-be-less-stateful'