add an export
Merge bug26165
stable to default