Merge branch `rewrite` into `master`.
Merge branch `rewrite` into `master`.
Cluster keeps id -> address map.