Merge "Fix pending job sorting." into sc-dev