BCS-8089-Edit