Merge "Add note about redundant file" into feature/zuulv3