Store the machines count in the bundle extra info.

Number of machines should not be bigger than number of units. See test comment below.