GCPGCP-7476, GCP-7479, GCP-7480
Merge branch 'master' of https://github.com/digitalabs/Fieldbook