Merge commit 'origin/bug_600_softwaremanager_small_fixes' into experimental