Export something new
Merge bug26193