Merged latest changes in the server to local workstation