performance improvement - replicator [RTFACT-16105]