Merge "Changes to partition breakout rules."