Merge branch 'file-chooser-init' into all-fix
Merge branch 'file-field-remove' into all-fix