Merge branch 'bpf-htab-fixes'