GCP-7583, GCP-7584 backend changes
Merge branch 'master' of https://github.com/digitalabs/Fieldbook