GCP-6907
GCp-6866
GCP-6906
GCP-6902
fix for the update
Merge branch 'master' of https://github.com/digitalabs/Fieldbook