new setup for parallel build on Abel
merge conflicts