Merge branch 'bpf-persistent'