(#2122) - Improvements to replication EE api