diff --git a/_articles/faqs/autofill-faqs.md b/_articles/faqs/autofill-faqs.md
index 432699d8..0b6eee74 100644
--- a/_articles/faqs/autofill-faqs.md
+++ b/_articles/faqs/autofill-faqs.md
@@ -29,3 +29,13 @@ order: 10
 1. Open Settings in your Android device.
 2. Scroll down and tap on Google.
 3. Tap on Auto-fill with Google and toggle it off.
+
+### Q: What do I do about 'Biometric unlock disabled pending verification of master password'?
+
+**A:** This most commonly occurs on iOS when you make a change to your device's biometrics settings (e.g. adding another finger to Touch ID). To resolve this error:
+
+1. **If you have [PIN Code]({{site.baseurl}}/article/unlock-with-pin/) verification active**, disable it.
+2. Log out of your Bitwarden mobile app.
+3. Check that your device settings are [setup to use Bitwarden for autofill]({{site.baseurl}}/article/auto-fill-ios/#keyboard-auto-fill).
+4. Log back in to your Bitwarden mobile app.
+5. Re-enable [PIN Code]({{site.baseurl}}/article/unlock-with-pin/) verification if you want to use it as a backup for [biometrics]({{site.baseurl}}/article/unlock-with-biometrics/).
diff --git a/_articles/faqs/security-faqs.md b/_articles/faqs/security-faqs.md
index 298875f0..e5d33851 100644
--- a/_articles/faqs/security-faqs.md
+++ b/_articles/faqs/security-faqs.md
@@ -80,7 +80,17 @@ Bitwarden takes user security and privacy seriously. Bitwarden maintains secure,
 
 ### Q: How does Bitwarden vet code changes?
 
-**A:** Confidence in the security of our systems is of utmost important to Bitwarden. All proposed code changes are reviewed by one or more non-author members of the team before they can be merged into any codebase. All code goes through multiple test and QA environments prior to production. Bitwarden has implemented a SOC2 report to audit and validate our internal procedures. As mentioned in the report, our team is subject to rigorous background check and thorough interview processes. Bitwarden, being an open-source product, also welcomes peer-review of our code at any point. The team at Bitwarden strives to do everything we can to keep our users comfortable, and keeping their data secure. 
+**A:** Confidence in the security of our systems is of utmost important to Bitwarden. All proposed code changes are reviewed by one or more non-author members of the team before they can be merged into any codebase. All code goes through multiple test and QA environments prior to production. Bitwarden has implemented a SOC2 report to audit and validate our internal procedures. As mentioned in the report, our team is subject to rigorous background check and thorough interview processes. Bitwarden, being an open-source product, also welcomes peer-review of our code at any point. The team at Bitwarden strives to do everything we can to keep our users comfortable, and keeping their data secure.
+
+### Q: How long does Bitwarden cache session information?
+
+**A:** Great question! The answer depends on the particular piece of information and client application:
+
+- Offline Vault sessions will expire after 30 days.
+  - **Except** for mobile client applications, which will expire after 90 days.
+- [Two-step Login]({{site.baseurl}}/article/setup-two-step-login) **Remember Me** selections will expire after 30 days.
+- Directory Connector [sync cache]({{site.baseurl}}/article/clear-sync-cache/) will be cleared after 30 days.
+- Organization invites will expire after 5 days. Self-hosted customers can configure this [using an environment variable]({{site.baseurl}}/article/environment-variables/#optional-variables).
 
 ### Questions Regarding Specific Client Apps
 
diff --git a/_articles/features/auto-fill-ios.md b/_articles/features/auto-fill-ios.md
index ddbacf6f..e39b1cd6 100644
--- a/_articles/features/auto-fill-ios.md
+++ b/_articles/features/auto-fill-ios.md
@@ -48,9 +48,9 @@ To enable keyboard auto-fill on iOS:
 
    {% image features/auto-fill-ios/autofill-ios.jpeg AutoFill on iOS %}
 
-   If a [matching Login]({% link _articles/features/uri-match-detection.md %}) is displayed, tap it to auto-fill. If the {% icon fa-key %} **Passwords** button is displayed, tap it to browse your Vault for the Login item to use.
+   If a [matching Login]({% link _articles/features/uri-match-detection.md %}) is displayed, tap it to auto-fill. If the {% icon fa-key %} **Passwords** button is displayed, tap it to browse your Vault for the Login item to use. In cases where the {% icon fa-key %} **Passwords** button is displayed, it's probably because there isn't an item in your Vault with a [matching URI]({% link _articles/features/uri-match-detection.md %}).
 
-   {% callout success %}If the {% icon fa-key %} **Passwords** button is displayed, it's probably because there isn't an item in your Vault with a [matching URI]({% link _articles/features/uri-match-detection.md %}).{% endcallout %}
+   {% callout info %}Are you getting a `Biometric unlock disabled pending verification of master password` message? [Learn what to do]({{site.baseurl}}/article/autofill-faqs/#q-what-do-i-do-about-biometric-unlock-disabled-pending-verification-of-master-password).{% endcallout%}
 
 ### Browser App Extension Auto-fill
 
diff --git a/_articles/hosting/licensing-on-premise.md b/_articles/hosting/licensing-on-premise.md
index 8bbbe18a..a8a0e449 100644
--- a/_articles/hosting/licensing-on-premise.md
+++ b/_articles/hosting/licensing-on-premise.md
@@ -31,7 +31,7 @@ For individual users, complete the following steps to retrieve and apply a licen
 
 ## Organization License
 
-For Owners of a Families or Enterprise Organization, complete the following steps to retrieve and apply a license to your self-hosted instance:
+For Owners of an Organization, complete the following steps to retrieve and apply a license to your self-hosted instance:
 
 1. Log in to your [Web Vault](https://vault.bitwarden.com){:target="\_blank"} and open your Organization.
 2. In your Organization, open the **Settings** tab and select **Subscription** from the left menu.
@@ -44,3 +44,13 @@ For Owners of a Families or Enterprise Organization, complete the following step
 5. Start a new Organization in your self-hosted instance by selecting the {% icon fa-plus %} **Add Organization** button.
 
    You will be prompted to upload a license file. Select the **Browse** button and add your downloaded license file.
+
+### Update a renewed Organization License
+
+When your license expires and your Organization renews, you have 2 months to apply the updated license file to your self-hosted Organization. To apply the update your license, download the new license file (**Steps 1-3 above**) from the cloud-hosted Bitwarden Organization Vault.
+
+Once downloaded, open your self-hosted Web Vault and update the license from the Organization **Settings** → **Subscription** page:
+
+{% image hosting/update-license.png Update a self-hosting license %}
+
+If you receive a `version not supported` error message, you'll need to update your server before proceeding. Make a backup or copy of the `bwdata` directory, then follow [these instructions]({{site.baseurl}}/article/updating-on-premise/). 
diff --git a/_articles/organizations/onboarding-and-succession.md b/_articles/organizations/onboarding-and-succession.md
index a908c9d2..aa9b8e76 100644
--- a/_articles/organizations/onboarding-and-succession.md
+++ b/_articles/organizations/onboarding-and-succession.md
@@ -167,7 +167,7 @@ Directory Connector will:
 
 ### Login with SSO
 
-Bitwarden Enterprise Organizations can integrate with you existing Identity Provider (IdP) using SAML 2.0 or OIDC to allow members of your Organization to login to Bitwarden using SSO. Login with SSO separates user authentication from Vault decryption:
+Bitwarden Enterprise Organizations can integrate with your existing Identity Provider (IdP) using SAML 2.0 or OIDC to allow members of your Organization to login to Bitwarden using SSO. Login with SSO separates user authentication from Vault decryption:
 
 **Authentication** is completed to your chosen IdP and retains any two-factor authentication processes connected to that IdP. **Decryption** of Vault data requires the user's individual key, through the Master Password. Using Login with SSO, new Bitwarden users can authenticate into their Bitwarden Vault using their regular SSO credentials and perform decryption of this Vault with their newly created master password. Users that removed from your IdP will no longer be able to authenticate with that path.
 
diff --git a/_articles/plans-and-pricing/organization-renewal.md b/_articles/plans-and-pricing/organization-renewal.md
new file mode 100644
index 00000000..57dc4d59
--- /dev/null
+++ b/_articles/plans-and-pricing/organization-renewal.md
@@ -0,0 +1,35 @@
+---
+layout: article
+title: Organization Renewal
+categories: [plans-and-pricing]
+featured: false
+popular: false
+hidden: false
+tags: [plans, premium, renewal]
+order: 07
+---
+
+Organization subscriptions renew automatically on an annual or monthly basis. You can check your renewal date from your [Web Vault](https://vault.bitwarden.com){:target="\_blank"} by navigating to Organization **Settings** → **Subscription**.
+
+As your renewal date approaches, Bitwarden recommends that you validate the payment method by navigating to Organization **Settings** → **Billing**. For help updating your payment method, see [Update Your Billing Information](https://bitwarden.com/help/article/update-billing-info/#update-billing-information-for-organizations).
+
+{% callout warning %}
+If we cannot process your payment method, or if you have cancelled your subscription, your Organization will be disabled. For **self-hosted customers**, there is a 2 month grace period between expiration of your [license]({{site.baseurl}}/article/licensing-on-premise/#organization-license) and disabling of your Organization. In either case, a disabled Organization will result in the following:
+
+**Shared Vault Items**
+
+[Owners]({{site.baseurl}}/article/user-types-access-control/) will retain access to [shared Vault items]({{site.baseurl}}/article/share-to-a-collection), however all other users will lose access to these items. Shared Vault items and existing [Collections]({{site.baseurl}}/article/about-collections/) **will not be deleted**.
+
+**Organization Users**
+
+Users and existing [Groups]({{site.baseurl}}/article/about-groups/) **will not be removed** from the Organization. When your Organization is [re-enabled](#re-enabling-a-disabled-organization), users will not need to take any action.
+
+{% endcallout %}
+
+## Re-enabling a disabled Organization
+
+If your cloud-hosted Organization is disabled, [Contact Us](https://bitwarden.com/contact/) with the subject **Disabled Organization**. The Bitwarden team will manually re-enable your Organization and work with the Accounts Receivable team for any further billing assistance.
+
+If your self-hosted Organization is disabled, download a new license file from your cloud-hosted Bitwarden Organization Vault. Once downloaded, open your self-hosted Web Vault and update the license from the Organization **Settings** → **Subscription** page:
+
+{% image hosting/update-license.png Update a self-hosting license %}
diff --git a/_articles/send/send-cli.md b/_articles/send/send-cli.md
index 8cca3b02..126714a9 100644
--- a/_articles/send/send-cli.md
+++ b/_articles/send/send-cli.md
@@ -68,13 +68,17 @@ For example:
 ```
 bw send template send.text | jq '.name="My First Send" | .text.text="Secrets I want to share."' | bw encode | bw send create
 ```
-or
+
 ```
-bw send template send.text | jq ".name=\"My First Send\" | .text.text=\"Secrets I want to share.\" | .password=\"mypassword\" | .deletionDate=\"$(date -uv+14d + "%Y-%m-%dT%H:%M:%SZ")\"" | bw encode | bw send create
+bw send template send.file | jq '.name="My File Send" | .type=1 | .file.fileName="paperwork.png" | .password="p@ssw0rd"' | bw encode | bw send create
+```
+
+```
+bw send template send.text | jq ".name=\"My Send\" | .text.text=\"Secrets I want to share.\" | .password=\"mypassword\" | .deletionDate=\"$(date -uv+14d + "%Y-%m-%dT%H:%M:%SZ")\"" | bw encode | bw send create
 ```
 
 {% callout success %}
-Notice in the 2nd example that the jq invocation must be wrapped in double quotes (`" "`) and use escapes (`\`) for each filter due to a nested `date` variable that configures a `.deletionDate` in the Send.
+Notice in the final example that the jq invocation must be wrapped in double quotes (`" "`) and use escapes (`\`) for each filter due to a nested `date` variable that configures a `.deletionDate` in the Send.
 {% endcallout %}
 
 **Options:**
diff --git a/images/hosting/update-license.png b/images/hosting/update-license.png
new file mode 100644
index 00000000..ae0dfb5a
Binary files /dev/null and b/images/hosting/update-license.png differ