Merge snapshot version of donut back into the main tree