Merge remote branch 'origin/bug_383_softwaremanager'