Merge branch `rewrite` into `master`.
Merge branch `rewrite` into `master`.
Merge branch `rewrite` into `master`.
Merge branch `rewrite` into `master`.
Update ID handling.