Add multi encryption key support

finish encryption

fix refactor breaking a test

Multi decryption key support
Merge branch 'hotfix-3.3.11' into support-3.3