Trying to optimize find_slaves call for Tropical project
Fixed merge conflict on tropical project