reconcile donut snapshot

Merge branch 'donut-snapshot' into HEAD