Changes from server
Merging server changes with origin.