Getting a bit hard to track stuff in the internals channel, so I'm making a few issues After #11266 `Client` will become the only class extending `BaseClient`. We should be merging them
