Automatic merge from submit-queue Append both the zone and the region to the federation query responses, not just the zone. This PR is based on @mml's #27896. I will rebase once that PR is merged. []()