Merge "netbpfload: prep work to support <U" into main