Summary: to include the set "zone" in resolved result
Reviewed-by: sherman, chegar