BPOT-2660-Edit