Merge "Add ClusterDisplayController." into sc-dev