Merge "Revert "bpf: offload.c - comment out CRITICAL mark"" into main