This MR adds some infrastructure that will be needed by the mailbox client manager.
First part of #2228 (closed)
