Merge branch 'bpf_modify_ret'