Merge "Add 'encryption_id' parameter to enc type calls"