Merge "Remove outdated TODO" into feature/zuulv3