Fix the dependencies.
Merge branch 'base'