Merge pull request #22832 from jmcclelland/ufexport