Merge branch 'hotfix-survey'
Resolved merge conflict
Resolved merge conflict