GCP-6347 GCP-6348 GCP-6349
Merge branch 'master' of https://github.com/digitalabs/Fieldbook