Merge branch 'bpf-share-helpers'