Backported bug fix for 60 or fewer collected deviations