Merge "Don't rush job checking at boot." into main