Encryption_After_clear
Merge origin/master