Merge pull request #1945 from gianlucapiccolo/fix-1944
Filesystem: fix to avoid killing unrelated processes