reconcile donut snapshot

Merge branch 'donut-snapshot' into HEAD
tree: 567634d378a3f3d729da960eea1b228f412a7ad2
  1. include/
  2. media/