Merge "Be explicit about legacy var additions/omissions" into feature/zuulv3