Merged changes in Server