Experimental: prep for Cluster merge