Merge pull request #10671 from wtgodbe/Redist