Merge "Fix to prevent unsorted breakpoints returning wrong spec" into main