Merge "Add an idea for how we could reduce the netId size in the future." into main