Try to re-enable all scoping code
Merge branch 'develop' of https://github.com/osate/osate2-core.git into develop