Merge branch 'feature/improve-scop-graph' into par-tools