Reduce number of cores for gradient_friction test
Merge remote-tracking branch 'origin'