Merge pull request #1 from nanliu/master

Update transport module
Merge pull request #2 from gavin-scott/backport-fix

Merge pull request #1 from nanliu/master