Merge "Fixed initial blocking conditions when job-id is not generated." into main