Merge branch `rewrite` into `master`.
TODO comments.