Merge "Update replication plugin to get fixes for CI flakiness"