Partiton overheads are dependent on the number of tasks as well as the tiers.
Fix merge conflicts