GCP-8055
Merge branch 'branch_save_fieldmap' of https://github.com/digitalabs/Fieldbook into branch_save_fieldmap