Merge commit 'origin/bug_383_softwaremanager' into experimental