fix for no-ff#10

madkoo merged 4 commits into

mainmadkoo/distributed-files:mainfrom

bug/handle-non-ffmadkoo/distributed-files:bug/handle-non-ffCopy head branch name to clipboard