Refs #8280 warning for overlap
Merge branch 'feature/8280_overlapping_peaks' into develop