General:

Problem with m_maxBatchBytes logic in RecallTaskInjector:

Refactor Catalogue and RdbmsCatalogue classes: