Merge in CGD/gather-and-defend from prog/fix_detection_range to main * commit '937624f54fafd20cbc70dd752fa00314139ec795': remove underscore fix detection range