Merge "Always strip {name} from name" into feature/zuulv3