GCP-7512 bug fixes
Merge branch 'master_GCP-7512_dynamic_connection' of https://github.com/digitalabs/Fieldbook into master_GCP-7512_dynamic_connection