Merge "Fix system crash in certain jobs-removed cases"