am b23896da: Merge snapshot version of donut back into main tree

Merge commit 'b23896da46a9290b9e8c7b1e540d4d4a6cebcfab'

* commit 'b23896da46a9290b9e8c7b1e540d4d4a6cebcfab':
  donut snapshot