Merge "Fix error loading projects out of order" into feature/zuulv3