next.js

Replace tuples with better suited data structures for server references

#86294

Merged