GCP-6205, GCP-6206 initial changes
Merge branch 'master' of https://github.com/digitalabs/Fieldbook
GCP-6205, GCP-6206
added comments
GCP-6205, GCP-6206