Resolving conflicts on exploratory results

- Merge branch 'AnalysisQuery'