Merge branch `rewrite` into `master`.
Merge branch `rewrite` into `master`.
Continue removing Cluster object.