Merge "Refactor manage-projects for readability"