Fix undeleted temporary surveys in remove all surveys
Merge branch 'developer'