Merge "Fleetify nova conductor for N cells"