Extended export commands to support exporting from trees with mixed feature types
Merge branch 'volaya/output_improv'