Merge branch 'bug_351_softwaremanager_save_config_before_backup'