We have some plans to do some major work in the replication protocol. e.g. multiplex PINGS, replica-buffers, and RDB together, see: https://github.com/redis/redis/pull/8440#issuecomment-771623319 A prerequisite for that is some cleanup in replication.c that's currently a bit messed up. Maybe splitting it into two, one file for code that runs on the master and one for code that runs in the replica, or at the very least give functions proper prefixes. TBD.