Merge snapshot version of donut back into main tree