FS-13 FS-9 EncryptionManager added extra check