BCS-7925-Edit