BCS-7858-Edit