[ANALYZER-2197] Mega merge of the IOlapService.