Merge commit 'origin/bug_351_softwaremanager_save_config_before_backup' into experimental