Merge "Add an additional pass through project templates" into feature/zuulv3