added MR 148 and commit abd0961a

This MR adds MR148 made to master (it is not merged into master yet) and the commit made to master here

The MR148 fixes cases where the file path handling and file transfer was failing.

The commit is a commit made to O3b_online but was not added into master