CSIT-1110: Cherry-pick edits into new detection