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