Migration from old surveys to new ones
Merge branch '3-0-dev' into 3-0-stable