CSIT-1110: Prepare for migrating the new detection