Merge snapshot variant of donut back into the main tree