Merge pull request #15312 from seamuslee001/export_hook_test