Merge remote-tracking branch 'origin/RefactoringAnalysisModules' into RefactoringAnalysisModules