Merge commit 'origin/bug_503_softwaremanager_catch_feederror'