Merge "bpf_helpers: comment adjustment" into main