Add missing transitive dependencies
Merge branch 'dev'