Export detach
Merge pull request #3768 from simonster/export-detach

Export detach