REFS SPOT-1885
Added ClusterByBuilding capability