am 3159e326: Merge snapshot variant of donut back into the tree

Merge commit '3159e3260e7e380469b5af353cc8af17525dbf20'

* commit '3159e3260e7e380469b5af353cc8af17525dbf20':
  donut snapshot