Merge pull request #19582 from mattwire/extensiondownloader