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