Merge branch 'bug_308_add_where_softwaremanager'