Merge "Update replication plugin" into stable-2.10