[mkilling]

We experimented with team branches to integrate work of the subteams before merging into develop, but that did not work out very well