No merge, should replace comment with TODO: drain replication publisher