Merge pull request #20528 from colemanw/exportFix2