Bring wip `cluster.ns` back into dev branch