Merge snapshot variant of donut back into main tree