#231 work with connection refactored
Merge remote-tracking branch 'origin/develop' into 185-backup-restore