Copied from server and merged changes.