[BPFD-663] This is ready for review