More send receive related changes

Change-Id: I288f0a03ebe887f8f956cb9b98673fd2e9a39d11