Merge pull request #7726 from tobiasd/20191010-uexport