FS-10 FS-12 FS-24 Bug fixes
Merge branch 'FS-24' of https://github.com/Fides-Storage/Client into FS-24