Merge "More targeted dependencies"