Merge "Add a new flag so that we can switch and avoid teamfood problems" into main