Merge "Fix for missing dependencies"