Applying contention fix to driver-compat - not complete so turning off parallel builds again