BCS-7866-Edit