Merge pull request #3801 from mwarning/fix-broken-dependency-detection