GCP-7594
GCP-7145
Merge branch 'listmanager_sidebyside' of https://github.com/digitalabs/BreedingManager into listmanager_sidebyside