resolved dependencies
Merge branch 'develop' into Redefinition