Merge "(bug 40415) Add missing dependencies for some modules"