[softwaremanager] try to fix backup
Merge branch 'master' into beta