saves survey refs item:414
more fixes for save survey refs item:414
Merge branch 'upstream-develop' into bug/save-survey
Merge pull request #254 from jofomah/bug/save-survey

Bug/save survey