Merge branch 'bpf-blinding'