GCP-7133
GCP-7306
Merge branch 'devbranch' of github.com:digitalabs/BreedingManager into devbranch