Rolling back changes to Directory Listener as it has mysterious behavior
Merge branch 'fix-replication' into dev