Merge changes I91762453,Ic1abc3c0

* changes:
  Clean up code in WSA and WS
  Send transaction when possible for WSA