Merge branch `rewrite` into `master`.
Merge branch `rewrite` into `master`.
Fix prepare requests.
Diary entry.
Cleanup and NACK requests.