Merge "Disable non-thread local network matching" into main