GCP-5504 and GCP-5360
Merge branch 'master' of github.com:digitalabs/BreedingManager