Merge branch 'bug/JAL-1643_File-chooser-improvement' into develop