bugfix when working with hybrid projects (configuration referencing a baselin)
Merge branch 'dev'