Merge "Make it possible to change the number of remote jobs"