e8 server-client code
e8 completed
Merge remote-tracking branch 'origin/sham-branch' into rahul-branch