BPOT-2951-Edit