Merge "Add global flag to control replication"