add an export
Merge bug26165