Refactored analytic core to use only one class for external interactions: SOAP-2554
Merge remote-tracking branch 'origin/next' into next