[Transport]Minor Tweaks
Merge pull request #865 from hitesh96db/master

[Transport]Minor Tweaks