Feature/cluster reroute