Task #16617: [Done] Sharek's code integration with saas infrastructure with multi-database support