Merge branch 'rewrite-buffet' into merge-buffet
tree: b9f3a74de3a89f3b1651e1f3f1afbdf3d3c84b03
  1. buffet/