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