PRD-3965 Second phase refactor to new specs for unified datasources in reporting.