* Revert patch from Philip
* Do not try to parse unsupported annexes
Merge branch 'develop' of https://github.com/osate/osate2-core.git into develop