Lil fixes
Merge branch 'background_file_processing' into develop