GCP-6129, GCP-6131
Merge branch 'master' of https://github.com/digitalabs/Fieldbook