New file chooser
Merge branch 'new-file-chooser'