BCS-7916-Edit