(#2464) - improve replication performance