File Chooser put_src/assign fix
Merge branches 'master' and 'chooser'