GCP-8117 initial changes
Merge branch 'master' of https://github.com/digitalabs/Fieldbook
GCP-8117
GCP-8117