Adding "Consolidate" dependency
Merge branch 'develop'