Merge "Tempest cleanup: improve iterating over projects"