am 6126eafd: reconcile donut snapshot

Merge commit '6126eafdca67313607bd385b2c7f4f9dfe6f76da'

* commit '6126eafdca67313607bd385b2c7f4f9dfe6f76da':
  donut snapshot