FS-21 FS-22 added hashes on client