Added v0.8 server related changes