Merge "Allow dependencies on non-default link paths"