final updates for replication and v2.0.7