am 6126eafd: reconcile donut snapshot

Merge commit '6126eafdca67313607bd385b2c7f4f9dfe6f76da'

* commit '6126eafdca67313607bd385b2c7f4f9dfe6f76da':
  donut snapshot
tree: 085661ae2993327d4df9ecd3e2a5e958f1fa5dbb
  1. core/
  2. services/