Add support for encrypter persistence
Cleanup
Merge branch 'kali-master'