Merge "Fixes in EchoService"