fix for file transfer issue - on main

Charlotte Hausmanrequested to merge
add_file_transfer_changes_to_main into main

add fix for 2.0 into main

Merge request reports