pending changes on ftp server parked to switch to a working branch
fix broken server
fix unittests
Merge branch 'ftp' into dev
fix issues raise due merge
Merge commit '0701a47e2220338b1a9bd51d32bf4f04ee170988' into Master