Merged current version from new server