Merge "Remove project3" into feature/zuulv3