EncryptionMethod.EMBEDDED
Merge branch 'master' into beta