Full differentiation between client and host
Merge conflict fix