merge refactoring-apogee-analysis into code-refactoring