Merge pull request #3967 from akallabeth/sec_encrypt_fix