Merge "more classic bpf macros" into main