MSC: merge changes from _tent/clust