3b4e812449
* Encryption: Keep legacy default provider id on providers map * Minor fixes * Refactor
* Encryption: Keep legacy default provider id on providers map * Minor fixes * Refactor