Merge from fredServer