Initial starred export support.
Merge branch 'master' into starred_export
Finalized starred export