GCP-7910 and GCP-7909
Merge branch 'master' of github.com:digitalabs/BreedingManager