Merge: from fix_sortdeferred_race - Bugfix for sorting of hits potentially running in a race with previously scheduled jobs Tests: unit tests