Out Of Memory handling in replicator added