Please review branch feature/remove_grant_replication