Merge pull request #8688 from ysolovyov:num-jobs-fix