Send/Receive and Chorus ref changes

Change-Id: Ib9e13ce06640f5ac14197b10691c0a45d1d957c6