Fixed issue #07807:  Error when deactivating survey (c_schmitz )
Dev: cherry-pick 2506a1dd91fcc855afc9571d8693bed631418f9c
Dev: need to deactivate survey in 205 to test some dev