Merge "Fix gateway nodes location"