Fix copy survey to org bug
Merge branch 'MH-770' into dev