Merge branch 'feature_add_backup_set'