Fix race conditions#987

cram-cfa wants to merge 14 commits intomaincodeforamerica/form-flow:mainfrom

fix-race-conditionscodeforamerica/form-flow:fix-race-conditionsCopy head branch name to clipboard