Merge remote branch 'remotes/origin/bug_600_softwaremanager_small_fixes'