Merge branch 'bpf-dedup-fixes'