[BPFD-645] fixes