Merge pull request #7701 from mikeller/fix_target_independence_check