Merge pull request #6862 from jesferman/fix_11r_dependencies