Merge branch 'bpf-cap'