diff --git a/give.php b/give.php
index a6b22200a9..941ac3021b 100644
--- a/give.php
+++ b/give.php
@@ -6,7 +6,7 @@
  * Description: The most robust, flexible, and intuitive way to accept donations on WordPress.
  * Author: GiveWP
  * Author URI: https://givewp.com/
- * Version: 2.20.2
+ * Version: 2.21.0
  * Requires at least: 5.0
  * Requires PHP: 7.0
  * Text Domain: give
@@ -85,7 +85,7 @@
 /**
  * Main Give Class
  *
- * @unreleased Remove php dependency validation logic and constant
+ * @since 2.21.0 Remove php dependency validation logic and constant
  * @since 2.19.6 add $donations, $subscriptions, and replace $donors class with DonorRepositoryProxy
  * @since 2.8.0 build in a service container
  * @since 1.0
@@ -294,7 +294,7 @@ private function setup_constants()
     {
         // Plugin version.
         if (!defined('GIVE_VERSION')) {
-            define('GIVE_VERSION', '2.20.2');
+            define('GIVE_VERSION', '2.21.0');
         }
 
         // Plugin Root File.
diff --git a/includes/admin/tools/export/class-batch-export.php b/includes/admin/tools/export/class-batch-export.php
index f8fd1e1616..1a497f36a1 100644
--- a/includes/admin/tools/export/class-batch-export.php
+++ b/includes/admin/tools/export/class-batch-export.php
@@ -116,7 +116,7 @@ class Give_Batch_Export extends Give_Export {
 	/**
 	 * Give_Batch_Export constructor.
 	 *
-     * @unreleased Create only csv file.
+     * @since 2.21.0 Create only csv file.
 	 * @since 2.9.0 add hash to filename to avoid collisions
 	 * @since 1.5
 	 *
diff --git a/includes/admin/tools/export/export-actions.php b/includes/admin/tools/export/export-actions.php
index bb76fab690..c25fd054f6 100644
--- a/includes/admin/tools/export/export-actions.php
+++ b/includes/admin/tools/export/export-actions.php
@@ -17,7 +17,7 @@
 /**
  * Process the download file generated by a batch export.
  *
- * @unreleased Sanitize file name. Allow plain file name only.
+ * @since 2.21.0 Sanitize file name. Allow plain file name only.
  * @since 2.9.0 pass the filename received to the exporter
  * @since 1.5
  *
diff --git a/includes/admin/tools/export/export-functions.php b/includes/admin/tools/export/export-functions.php
index a01ecf8229..2ded5206a0 100755
--- a/includes/admin/tools/export/export-functions.php
+++ b/includes/admin/tools/export/export-functions.php
@@ -19,7 +19,7 @@
 /**
  * Process batch exports via ajax
  *
- * @unreleased Sanitize file name. Allow plain file name only.
+ * @since 2.21.0 Sanitize file name. Allow plain file name only.
  * @since 1.5
  * @return void
  */
diff --git a/includes/class-give-readme-parser.php b/includes/class-give-readme-parser.php
index a3220d05b3..b8b9115c67 100644
--- a/includes/class-give-readme-parser.php
+++ b/includes/class-give-readme-parser.php
@@ -53,7 +53,7 @@ public function requires_at_least()
     }
 
     /**
-     * @unreleased
+     * @since 2.21.0
      */
     protected function get_readme_file_content(): string
     {
diff --git a/includes/donors/actions.php b/includes/donors/actions.php
index 336d78047c..4750b20332 100644
--- a/includes/donors/actions.php
+++ b/includes/donors/actions.php
@@ -2,7 +2,7 @@
 /**
  * Insert donor comment to donation.
  *
- * @unreleased remove anonymous
+ * @since 2.21.0 remove anonymous
  * @since 2.2.0
  *
  * @param  int  $donation_id
diff --git a/includes/forms/functions.php b/includes/forms/functions.php
index 2100c33e46..4380ea3b6b 100644
--- a/includes/forms/functions.php
+++ b/includes/forms/functions.php
@@ -167,7 +167,7 @@ function give_send_to_success_page( $query_string = null ) {
  * @param array|string $args
  *
  * @access public
- * @unreleased Auto set "payment-mode" in redirect url.
+ * @since 2.21.0 Auto set "payment-mode" in redirect url.
  * @since  1.0
  * @return Void
  */
diff --git a/includes/gateways/functions.php b/includes/gateways/functions.php
index be3218ca95..ca25ae78d2 100644
--- a/includes/gateways/functions.php
+++ b/includes/gateways/functions.php
@@ -119,7 +119,7 @@ function give_get_default_gateway( $form_id ) {
 /**
  * Returns the admin label for the specified gateway
  *
- * @unreleased remove hard coded admin_labels
+ * @since 2.21.0 remove hard coded admin_labels
  * @since 1.0
  *
  * @param  string  $gateway  Name of the gateway to retrieve a label for
diff --git a/includes/gateways/stripe/includes/payment-methods/class-give-stripe-card.php b/includes/gateways/stripe/includes/payment-methods/class-give-stripe-card.php
index 40abb71265..8dc8c06327 100644
--- a/includes/gateways/stripe/includes/payment-methods/class-give-stripe-card.php
+++ b/includes/gateways/stripe/includes/payment-methods/class-give-stripe-card.php
@@ -32,7 +32,7 @@ class Give_Stripe_Card {
 
 
 		/**
-         * @unreleased recover method for legacy give-recurring usage.
+         * @since 2.21.0 recover method for legacy give-recurring usage.
          * @since  1.0
          *
 		 * Stripe uses it's own credit card form because the card details are tokenized.
@@ -49,7 +49,7 @@ class Give_Stripe_Card {
 		 */
 		public function addCreditCardForm( $form_id, $args, $echo = true ) {
             $form = $this->getCreditCardFormHTML($form_id, $args);
-            
+
             if ( false !== $echo ) {
 				echo $form;
 			}
diff --git a/includes/install.php b/includes/install.php
index e1fdae9e6b..d65c3c183f 100644
--- a/includes/install.php
+++ b/includes/install.php
@@ -525,7 +525,7 @@ function __give_get_tables()
  * Register classes
  * Note: only for internal purpose use
  *
- * @unreleased Install migration table on fresh install because this table is required to run migrations.
+ * @since 2.21.0 Install migration table on fresh install because this table is required to run migrations.
  * @since 2.3.1
  * @throws DatabaseMigrationException
  */
diff --git a/readme.txt b/readme.txt
index c828ae2ebb..1c0e8d4c93 100644
--- a/readme.txt
+++ b/readme.txt
@@ -5,7 +5,7 @@ Tags: donation, donate, recurring donations, fundraising, crowdfunding
 Requires at least: 5.0
 Tested up to: 6.0
 Requires PHP: 7.0
-Stable tag: 2.20.2
+Stable tag: 2.21.0
 License: GPLv3
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
 
@@ -251,6 +251,27 @@ The 2% fee on Stripe donations only applies to donations taken via our free Stri
 8. GiveWP has a dedicated support team to help answer any questions you may have and help you through stumbling blocks.
 
 == Changelog ==
+= 2.21.0: June 16th, 2022 =
+* New: Fresh new look for the Donor Wall block and shortcode!
+* New: Form Grid looks has a great new look and more visual options!
+* Enhancement: The new Gateway API now uses he new Models
+* Enhancement: All failed queries are now logged with extra data to troubleshoot
+* Enhancement: Some minor visual improvements on the Logs admin page
+* Security: Remove an unused donor wall endpoint that made donor wall data too easy to access
+* Security: Donors can no longer immediately access the Donor Dashboard without authentication
+* Security: Further tightening of XSS protection per WordPress security guidelines
+* Security: Tighten up file exposure to GiveWP Managers in the Exporter
+* Fix: Prevent a notice and database error on fresh installs
+* Fix: Cleared up some notices that logging was causing
+* Fix: Admin notices no longer scrunch all weird-like up at the top of the page
+* Fix: Further compatibility fixes for PHP 8.1
+* Fix: Text aligns better for offline donations in the form
+* Fix: Stripe gracefully ignores events that come in from another platform
+* Fix: Brought back accidentally removed income goal stat filters. Thanks sc0ttkclark!
+* Fix: Make sure that all donation errors are caught and gracefully handled to inform the donor
+* Fix: Renewals now display the correct payment type in the admin donations list
+* Fix: Checkboxes (also created via Form Field Manager) no longer require being checked when conditionally hidden
+
 = 2.20.2: June 8th, 2022 =
 * Security: Donors are no longer able to view the Donor Dashboard for the email they donated in without logging in
 * Security: Added additional URL escaping around the codebase to protect against XSS attacks
diff --git a/src/DonationForms/Controllers/DonationFormsRequestController.php b/src/DonationForms/Controllers/DonationFormsRequestController.php
index c5d5d1fb89..463e70d1d4 100644
--- a/src/DonationForms/Controllers/DonationFormsRequestController.php
+++ b/src/DonationForms/Controllers/DonationFormsRequestController.php
@@ -9,7 +9,7 @@
 /**
  * Donation Forms Request Controller class
  *
- * @unreleased
+ * @since 2.21.0
  */
 class DonationFormsRequestController
 {
diff --git a/src/DonationForms/DataTransferObjects/DonationFormsResponseData.php b/src/DonationForms/DataTransferObjects/DonationFormsResponseData.php
index 6e61f57d6d..55d392eb88 100644
--- a/src/DonationForms/DataTransferObjects/DonationFormsResponseData.php
+++ b/src/DonationForms/DataTransferObjects/DonationFormsResponseData.php
@@ -8,7 +8,7 @@
 /**
  * Class DonationFormsResponseData
  *
- * @unreleased
+ * @since 2.21.0
  */
 class DonationFormsResponseData implements Arrayable
 {
@@ -63,7 +63,7 @@ class DonationFormsResponseData implements Arrayable
      *
      * @param object $form
      *
-     * @unreleased
+     * @since 2.21.0
      */
     public static function fromObject($form): self
     {
@@ -87,7 +87,7 @@ public static function fromObject($form): self
     /**
      * Convert DTO to array
      *
-     * @unreleased
+     * @since 2.21.0
      */
     public function toArray(): array
     {
@@ -99,7 +99,7 @@ public function toArray(): array
      *
      * @return array
      *
-     * @unreleased
+     * @since 2.21.0
      */
     private function getGoal(int $formId): array
     {
@@ -137,7 +137,7 @@ private function getGoal(int $formId): array
      *
      * @return string
      *
-     * @unreleased
+     * @since 2.21.0
      */
     private function getFormAmount($form): string
     {
@@ -158,7 +158,7 @@ private function getFormAmount($form): string
      *
      * @return string
      *
-     * @unreleased
+     * @since 2.21.0
      */
     private function formatAmount(string $amount): string
     {
diff --git a/src/DonationForms/ValueObjects/DonationFormMetaKeys.php b/src/DonationForms/ValueObjects/DonationFormMetaKeys.php
index 43a1322f04..bad0fcd5bb 100644
--- a/src/DonationForms/ValueObjects/DonationFormMetaKeys.php
+++ b/src/DonationForms/ValueObjects/DonationFormMetaKeys.php
@@ -7,7 +7,7 @@
 /**
  * Donation Form Meta keys
  *
- * @unreleased
+ * @since 2.21.0
  *
  * @method static DonationFormMetaKeys FORM_EARNINGS()
  * @method static DonationFormMetaKeys DONATION_LEVELS()
diff --git a/src/Donations/Controllers/DonationsRequestController.php b/src/Donations/Controllers/DonationsRequestController.php
index 3a7849f97c..e4ad0cdc84 100644
--- a/src/Donations/Controllers/DonationsRequestController.php
+++ b/src/Donations/Controllers/DonationsRequestController.php
@@ -10,7 +10,7 @@
 /**
  * Donations Request Controller class
  *
- * @unreleased
+ * @since 2.21.0
  */
 class DonationsRequestController
 {
@@ -28,7 +28,7 @@ public function __construct(WP_REST_Request $request)
     }
 
     /**
-     * @unreleased
+     * @since 2.21.0
      *
      * @return array
      */
@@ -68,7 +68,7 @@ public function getDonations(): array
     }
 
     /**
-     * @unreleased
+     * @since 2.21.0
      *
      * @return int
      */
@@ -84,7 +84,7 @@ public function getTotalDonationsCount(): int
 
     /**
      * @param QueryBuilder $query
-     * @unreleased
+     * @since 2.21.0
      *
      * @return QueryBuilder
      */
diff --git a/src/Donations/DataTransferObjects/DonationResponseData.php b/src/Donations/DataTransferObjects/DonationResponseData.php
index bd485fbfb7..8a798a3bce 100644
--- a/src/Donations/DataTransferObjects/DonationResponseData.php
+++ b/src/Donations/DataTransferObjects/DonationResponseData.php
@@ -78,7 +78,7 @@ class DonationResponseData implements Arrayable
      *
      * @param  object  $donation
      *
-     * @unreleased use meta keys as camelcase
+     * @since 2.21.0 use meta keys as camelcase
      * @since 2.20.0
      */
     public static function fromObject($donation): DonationResponseData
@@ -118,7 +118,7 @@ public function toArray(): array
     /**
      * Get donation type to display on front-end
      *
-     * @unreleased refactor conditional for subscription renewals
+     * @since 2.21.0 refactor conditional for subscription renewals
      * @since 2.20.0
      * @param  object  $donation
      */
diff --git a/src/Donations/Factories/DonationNoteFactory.php b/src/Donations/Factories/DonationNoteFactory.php
index 3f8880d566..af46c0ba91 100644
--- a/src/Donations/Factories/DonationNoteFactory.php
+++ b/src/Donations/Factories/DonationNoteFactory.php
@@ -7,7 +7,7 @@
 class DonationNoteFactory extends ModelFactory
 {
     /**
-     * @unreleased
+     * @since 2.21.0
      *
      * @return array
      */
diff --git a/src/Donations/Models/DonationNote.php b/src/Donations/Models/DonationNote.php
index 464977a194..09c4807e79 100644
--- a/src/Donations/Models/DonationNote.php
+++ b/src/Donations/Models/DonationNote.php
@@ -14,7 +14,7 @@
 use Give\Framework\Support\Facades\DateTime\Temporal;
 
 /**
- * @unreleased
+ * @since 2.21.0
  *
  * @property int $id
  * @property int $donationId
@@ -42,7 +42,7 @@ class DonationNote extends Model implements ModelCrud, ModelHasFactory
     ];
 
     /**
-     * @unreleased
+     * @since 2.21.0
      *
      * @return DonationNote|null
      */
@@ -53,7 +53,7 @@ public static function find($id)
 
 
     /**
-     * @unreleased
+     * @since 2.21.0
      *
      * @return $this
      * @throws Exception|InvalidArgumentException
@@ -68,7 +68,7 @@ public static function create(array $attributes): DonationNote
     }
 
     /**
-     * @unreleased
+     * @since 2.21.0
      *
      * @return void
      * @throws Exception|InvalidArgumentException
@@ -83,7 +83,7 @@ public function save()
     }
 
     /**
-     * @unreleased
+     * @since 2.21.0
      *
      * @throws Exception|InvalidArgumentException
      */
@@ -93,7 +93,7 @@ public function delete(): bool
     }
 
     /**
-     * @unreleased
+     * @since 2.21.0
      *
      * @return ModelQueryBuilder<DonationNote>
      */
@@ -103,7 +103,7 @@ public static function query(): ModelQueryBuilder
     }
 
     /**
-     * @unreleased
+     * @since 2.21.0
      *
      * @return ModelQueryBuilder<Donation>
      */
@@ -113,7 +113,7 @@ public function donation(): ModelQueryBuilder
     }
 
     /**
-     * @unreleased
+     * @since 2.21.0
      *
      * @param  object  $object
      */
@@ -128,7 +128,7 @@ public static function fromQueryBuilderObject($object): DonationNote
     }
 
     /**
-     * @unreleased
+     * @since 2.21.0
      */
     public static function factory(): DonationNoteFactory
     {
diff --git a/src/Donations/Repositories/DonationNotesRepository.php b/src/Donations/Repositories/DonationNotesRepository.php
index 6aa5fe27ed..9ef368b43d 100644
--- a/src/Donations/Repositories/DonationNotesRepository.php
+++ b/src/Donations/Repositories/DonationNotesRepository.php
@@ -12,13 +12,13 @@
 use Give\Log\Log;
 
 /**
- * @unreleased
+ * @since 2.21.0
  */
 class DonationNotesRepository
 {
 
     /**
-     * @unreleased
+     * @since 2.21.0
      *
      * @var string[]
      */
@@ -28,7 +28,7 @@ class DonationNotesRepository
     ];
 
     /**
-     * @unreleased
+     * @since 2.21.0
      *
      * @param int $noteId
      *
@@ -42,7 +42,7 @@ public function getById(int $noteId)
     }
 
     /**
-     * @unreleased
+     * @since 2.21.0
      *
      * @param DonationNote $donationNote
      *
@@ -86,7 +86,7 @@ public function insert(DonationNote $donationNote)
     }
 
     /**
-     * @unreleased
+     * @since 2.21.0
      *
      * @param DonationNote $donationNote
      *
@@ -122,7 +122,7 @@ public function update(DonationNote $donationNote)
     }
 
     /**
-     * @unreleased
+     * @since 2.21.0
      *
      * @param DonationNote $donationNote
      *
@@ -155,7 +155,7 @@ public function delete(DonationNote $donationNote): bool
     }
 
     /**
-     * @unreleased
+     * @since 2.21.0
      *
      * @param  int  $donationId
      *
@@ -169,7 +169,7 @@ public function queryByDonationId(int $donationId): ModelQueryBuilder
     }
 
     /**
-     * @unreleased
+     * @since 2.21.0
      *
      * @param DonationNote $donationNote
      *
diff --git a/src/Donations/Repositories/DonationRepository.php b/src/Donations/Repositories/DonationRepository.php
index eaf7717f34..2b9177aaaa 100644
--- a/src/Donations/Repositories/DonationRepository.php
+++ b/src/Donations/Repositories/DonationRepository.php
@@ -28,7 +28,7 @@ class DonationRepository
     public $notes;
 
     /**
-     * @unreleased
+     * @since 2.21.0
      */
     public function __construct()
     {
@@ -65,7 +65,7 @@ public function getById(int $donationId)
     }
 
     /**
-     * @unreleased
+     * @since 2.21.0
      * @return Donation|null
      */
     public function getByGatewayTransactionId($gatewayTransactionId)
@@ -74,7 +74,7 @@ public function getByGatewayTransactionId($gatewayTransactionId)
     }
 
     /**
-     * @unreleased
+     * @since 2.21.0
      * @return ModelQueryBuilder
      */
     public function queryByGatewayTransactionId($gatewayTransactionId)
@@ -158,7 +158,7 @@ public function queryByDonorId(int $donorId): ModelQueryBuilder
 
     /**
      *
-     * @unreleased replace actions with givewp_donation_creating and givewp_donation_created
+     * @since 2.21.0 replace actions with givewp_donation_creating and givewp_donation_created
      * @since 2.20.0 mutate model and return void
      * @since 2.19.6
      *
@@ -230,7 +230,7 @@ public function insert(Donation $donation)
     }
 
     /**
-     * @unreleased replace actions with givewp_donation_updating and givewp_donation_updated
+     * @since 2.21.0 replace actions with givewp_donation_updating and givewp_donation_updated
      * @since 2.20.0 return void
      * @since 2.19.6
      *
@@ -280,7 +280,7 @@ public function update(Donation $donation)
     }
 
     /**
-     * @unreleased replace actions with givewp_donation_deleting and givewp_donation_deleted
+     * @since 2.21.0 replace actions with givewp_donation_deleting and givewp_donation_deleted
      * @since 2.20.0 consolidate meta deletion into a single query
      * @since 2.19.6
      *
diff --git a/src/Donors/Controllers/DonorsRequestController.php b/src/Donors/Controllers/DonorsRequestController.php
index b161bfc9f5..7608778010 100644
--- a/src/Donors/Controllers/DonorsRequestController.php
+++ b/src/Donors/Controllers/DonorsRequestController.php
@@ -9,7 +9,7 @@
 /**
  * Donors Request Controller class
  *
- * @unreleased
+ * @since 2.21.0
  */
 class DonorsRequestController
 {
@@ -27,7 +27,7 @@ public function __construct(WP_REST_Request $request)
     }
 
     /**
-     * @unreleased
+     * @since 2.21.0
      *
      * @return array
      */
@@ -65,7 +65,7 @@ public function getDonors(): array
     }
 
     /**
-     * @unreleased
+     * @since 2.21.0
      *
      * @return int
      */
@@ -79,7 +79,7 @@ public function getTotalDonorsCount(): int
 
     /**
      * @param QueryBuilder $builder
-     * @unreleased
+     * @since 2.21.0
      *
      * @return QueryBuilder
      */
diff --git a/src/Donors/Models/Donor.php b/src/Donors/Models/Donor.php
index f3e4b7432d..4abf9c85d0 100644
--- a/src/Donors/Models/Donor.php
+++ b/src/Donors/Models/Donor.php
@@ -94,7 +94,7 @@ public function hasEmail(string $donorEmail): bool
     }
 
     /**
-     * @unreleased
+     * @since 2.21.0
      *
      * @param  int  $userId
      * @return Donor|null
diff --git a/src/Donors/Repositories/DonorRepository.php b/src/Donors/Repositories/DonorRepository.php
index c008709a00..6015281457 100644
--- a/src/Donors/Repositories/DonorRepository.php
+++ b/src/Donors/Repositories/DonorRepository.php
@@ -95,7 +95,7 @@ public function getAdditionalEmails(int $donorId)
     }
 
     /**
-     * @unreleased add actions givewp_donor_creating and givewp_donor_created
+     * @since 2.21.0 add actions givewp_donor_creating and givewp_donor_created
      * @since 2.20.0 mutate model and return void
      * @since 2.19.6
      *
@@ -160,7 +160,7 @@ public function insert(Donor $donor)
 
     /**
      *
-     * @unreleased add actions givewp_donor_updating and givewp_donor_updated
+     * @since 2.21.0 add actions givewp_donor_updating and givewp_donor_updated
      * @since 2.20.0 return void
      * @since 2.19.6
      *
@@ -243,7 +243,7 @@ public function updateLegacyColumns(int $donorId, array $columns): bool
 
     /**
      *
-     * @unreleased add actions givewp_donor_deleting and givewp_donor_deleted
+     * @since 2.21.0 add actions givewp_donor_deleting and givewp_donor_deleted
      * @since 2.20.0 consolidate meta deletion into a single query
      * @since 2.19.6
      *
diff --git a/src/Form/LegacyConsumer/Actions/DetermineVisibilityForRequest.php b/src/Form/LegacyConsumer/Actions/DetermineVisibilityForRequest.php
index 7f24dc6155..ab473780e1 100644
--- a/src/Form/LegacyConsumer/Actions/DetermineVisibilityForRequest.php
+++ b/src/Form/LegacyConsumer/Actions/DetermineVisibilityForRequest.php
@@ -9,7 +9,7 @@
 use Give\ValueObjects\Money;
 
 /**
- * @unreleased
+ * @since 2.21.0
  */
 class DetermineVisibilityForRequest
 {
@@ -23,7 +23,7 @@ class DetermineVisibilityForRequest
     protected $postData;
 
     /**
-     * @unreleased
+     * @since 2.21.0
      * @param Field $field
      * @param array $postData
      */
@@ -34,7 +34,7 @@ public function __construct(Field $field, array $postData)
     }
 
     /**
-     * @unreleased
+     * @since 2.21.0
      */
     public function __invoke()
     {
@@ -47,7 +47,7 @@ public function __invoke()
     }
 
     /**
-     * @unreleased
+     * @since 2.21.0
      * @return bool
      */
     protected function fieldHasVisibilityConditions()
@@ -57,7 +57,7 @@ protected function fieldHasVisibilityConditions()
     }
 
     /**
-     * @unreleased
+     * @since 2.21.0
      * @param bool $visibility
      * @param Condition $condition
      * @return bool
@@ -72,7 +72,7 @@ protected function reduceVisibility($visibility, Condition $condition)
     }
 
     /**
-     * @unreleased
+     * @since 2.21.0
      * @param Condition $condition
      * @return bool
      */
@@ -87,7 +87,7 @@ protected function compareConditionWithOperator(Condition $condition)
     }
 
     /**
-     * @unreleased
+     * @since 2.21.0
      * @param BasicCondition $condition
      * @return bool
      */
@@ -120,7 +120,7 @@ protected function compareBasicConditionWithOperator(BasicCondition $condition)
     }
 
     /**
-     * @unreleased
+     * @since 2.21.0
      * @param $amount
      * @return int
      */
diff --git a/src/Framework/Database/Exceptions/DatabaseQueryException.php b/src/Framework/Database/Exceptions/DatabaseQueryException.php
index 4c644bb31e..46870be20e 100644
--- a/src/Framework/Database/Exceptions/DatabaseQueryException.php
+++ b/src/Framework/Database/Exceptions/DatabaseQueryException.php
@@ -11,7 +11,7 @@
  * An exception for when errors occurred within the database while performing a query, which stores the SQL errors the
  * database returned
  *
- * @unreleased Use the GiveWP exception class
+ * @since 2.21.0 Use the GiveWP exception class
  * @since 2.9.2
  */
 class DatabaseQueryException extends Exception
@@ -27,7 +27,7 @@ class DatabaseQueryException extends Exception
     private $query;
 
     /**
-     * @unreleased include query and query errors, and make auto-logging compatible
+     * @since 2.21.0 include query and query errors, and make auto-logging compatible
      * @since 2.9.2
      */
     public function __construct(
diff --git a/src/Framework/Exceptions/Traits/Loggable.php b/src/Framework/Exceptions/Traits/Loggable.php
index fa4109e54c..3711dbb24d 100644
--- a/src/Framework/Exceptions/Traits/Loggable.php
+++ b/src/Framework/Exceptions/Traits/Loggable.php
@@ -24,7 +24,7 @@ public function getLogMessage(): string
     /**
      * Returns an array with the basic context details
      *
-     * @unreleased Log meaningful data instead of entire exception object.
+     * @since 2.21.0 Log meaningful data instead of entire exception object.
      * @since 2.11.1
      *
      * @return array
diff --git a/src/Framework/PaymentGateways/CommandHandlers/PaymentCompleteHandler.php b/src/Framework/PaymentGateways/CommandHandlers/PaymentCompleteHandler.php
index 558a934312..7737817853 100644
--- a/src/Framework/PaymentGateways/CommandHandlers/PaymentCompleteHandler.php
+++ b/src/Framework/PaymentGateways/CommandHandlers/PaymentCompleteHandler.php
@@ -16,7 +16,7 @@ public function __construct(PaymentComplete $paymentCommand)
     }
 
     /**
-     * @unreleased
+     * @since 2.21.0
      */
     protected function getPaymentStatus(): DonationStatus
     {
diff --git a/src/Framework/PaymentGateways/CommandHandlers/PaymentHandler.php b/src/Framework/PaymentGateways/CommandHandlers/PaymentHandler.php
index 91ad5fba53..3c77aa782c 100644
--- a/src/Framework/PaymentGateways/CommandHandlers/PaymentHandler.php
+++ b/src/Framework/PaymentGateways/CommandHandlers/PaymentHandler.php
@@ -16,7 +16,7 @@ abstract class PaymentHandler
     protected $paymentCommand;
 
     /**
-     * @unreleased change return type to DonationStatus
+     * @since 2.21.0 change return type to DonationStatus
      *
      * @since 2.18.0
      */
@@ -39,7 +39,7 @@ public static function make(PaymentCommand $paymentCommand): PaymentHandler
     }
 
     /**
-     * @unreleased replace $donationId with Donation model
+     * @since 2.21.0 replace $donationId with Donation model
      * @since 2.18.0
      *
      * @throws Exception
diff --git a/src/Framework/PaymentGateways/CommandHandlers/SubscriptionCompleteHandler.php b/src/Framework/PaymentGateways/CommandHandlers/SubscriptionCompleteHandler.php
index 4ec3db71e2..95ae08c12f 100644
--- a/src/Framework/PaymentGateways/CommandHandlers/SubscriptionCompleteHandler.php
+++ b/src/Framework/PaymentGateways/CommandHandlers/SubscriptionCompleteHandler.php
@@ -12,7 +12,7 @@
 class SubscriptionCompleteHandler
 {
     /**
-     * @unreleased replace logic with models
+     * @since 2.21.0 replace logic with models
      * @since 2.18.0
      *
      * @throws Exception
diff --git a/src/Framework/PaymentGateways/Log/PaymentGatewayLog.php b/src/Framework/PaymentGateways/Log/PaymentGatewayLog.php
index ae77759d63..7817c0be10 100644
--- a/src/Framework/PaymentGateways/Log/PaymentGatewayLog.php
+++ b/src/Framework/PaymentGateways/Log/PaymentGatewayLog.php
@@ -6,7 +6,7 @@
 use Give\Log\Log;
 
 /**
- * @unreleased Remove GatewayPaymentData related code and Update 'source' to payment gateway name
+ * @since 2.21.0 Remove GatewayPaymentData related code and Update 'source' to payment gateway name
  * @since 2.19.6 remove cardInfo from log
  * @since 2.18.0
  */
diff --git a/src/Framework/PaymentGateways/PaymentGateway.php b/src/Framework/PaymentGateways/PaymentGateway.php
index 53c314d4cb..c729a0ab1c 100644
--- a/src/Framework/PaymentGateways/PaymentGateway.php
+++ b/src/Framework/PaymentGateways/PaymentGateway.php
@@ -73,7 +73,7 @@ public function supportsSubscriptions(): bool
     }
 
     /**
-     * @unreleased Handle PHP exception.
+     * @since 2.21.0 Handle PHP exception.
      * @since 2.19.0
      */
     public function handleCreatePayment(Donation $donation)
@@ -100,7 +100,7 @@ public function handleCreatePayment(Donation $donation)
     }
 
     /**
-     * @unreleased Handle PHP exception.
+     * @since 2.21.0 Handle PHP exception.
      * @since 2.19.0
      *
      */
@@ -227,7 +227,7 @@ public function handleGatewayPaymentCommand(GatewayCommand $command, Donation $d
     /**
      * Handle gateway subscription command
      *
-     * @unreleased Handle RedirectOffsite response.
+     * @since 2.21.0 Handle RedirectOffsite response.
      * @since 2.18.0
      *
      * @throws TypeNotSupported
@@ -303,7 +303,7 @@ public function generateSecureGatewayRouteUrl(string $gatewayMethod, int $donati
      * 1. Redirect to donation form if donation form submit.
      * 2. Return json response if processing payment on ajax.
      *
-     * @unreleased Handle PHP exception.
+     * @since 2.21.0 Handle PHP exception.
      * @since 2.19.0
      */
     private function handleExceptionResponse(\Exception $exception, string $message)
diff --git a/src/LegacyPaymentGateways/Adapters/LegacyPaymentGatewayAdapter.php b/src/LegacyPaymentGateways/Adapters/LegacyPaymentGatewayAdapter.php
index 21a25c798b..50da32bfc9 100644
--- a/src/LegacyPaymentGateways/Adapters/LegacyPaymentGatewayAdapter.php
+++ b/src/LegacyPaymentGateways/Adapters/LegacyPaymentGatewayAdapter.php
@@ -35,7 +35,7 @@ public function getLegacyFormFieldMarkup(
     /**
      * First we create a payment, then move on to the gateway processing
      *
-     * @unreleased Replace give_insert_payment with donation model. Store legacy subscription data in donation meta.
+     * @since 2.21.0 Replace give_insert_payment with donation model. Store legacy subscription data in donation meta.
      *             Attach subscription id to donation.
      * @since 2.19.0 Replace is_recurring with is_donation_recurring to detect recurring donations.
      * @since 2.18.0
@@ -110,7 +110,7 @@ private function validateGatewayNonce(string $gatewayNonce)
     /**
      * Set donation id to purchase session for use in the donation receipt.
      *
-     * @unreleased
+     * @since 2.21.0
      *
      * @param $donationId
      *
@@ -127,7 +127,7 @@ private function setSession($donationId)
     }
 
     /**
-     * @unreleased
+     * @since 2.21.0
      *
      * @param int|null $userId
      * @param string $donorEmail
diff --git a/src/Log/Log.php b/src/Log/Log.php
index ae08480831..faf9a7aa85 100644
--- a/src/Log/Log.php
+++ b/src/Log/Log.php
@@ -11,7 +11,7 @@
  *
  * The static facade intended to be the primary way of logging within GiveWP to make life easier.
  *
- * @unreleased Use array_diff_key to filter context data to prevent php warning with multi-dimension array
+ * @since 2.21.0 Use array_diff_key to filter context data to prevent php warning with multi-dimension array
  * @since 2.20.0 add sensitive information redaction; store context as arrays for JSON serialization
  * @since 2.19.6 added debug
  * @since 2.10.0
diff --git a/src/MigrationLog/Migrations/CreateMigrationsTable.php b/src/MigrationLog/Migrations/CreateMigrationsTable.php
index cf78a5b731..9bd6c2996e 100644
--- a/src/MigrationLog/Migrations/CreateMigrationsTable.php
+++ b/src/MigrationLog/Migrations/CreateMigrationsTable.php
@@ -44,7 +44,7 @@ public static function timestamp()
     }
 
     /**
-     * @unreleased Add Check whether table installed before adding it to database.
+     * @since 2.21.0 Add Check whether table installed before adding it to database.
      * @throws DatabaseMigrationException
      */
     public function run()
diff --git a/src/PaymentGateways/Actions/RegisterPaymentGateways.php b/src/PaymentGateways/Actions/RegisterPaymentGateways.php
index 16e59146fe..ad89870ede 100644
--- a/src/PaymentGateways/Actions/RegisterPaymentGateways.php
+++ b/src/PaymentGateways/Actions/RegisterPaymentGateways.php
@@ -62,7 +62,7 @@ public function __invoke(array $gateways): array
     /**
      * Register 3rd party payment gateways
      *
-     * @unreleased use givewp prefix for action
+     * @since 2.21.0 use givewp prefix for action
      * @since 2.18.0
      *
      * @param  PaymentGatewayRegister  $paymentGatewayRegister
@@ -75,7 +75,7 @@ private function register3rdPartyPaymentGateways(PaymentGatewayRegister $payment
     /**
      * Unregister 3rd party payment gateways
      *
-     * @unreleased use givewp prefix for action
+     * @since 2.21.0 use givewp prefix for action
      * @since 2.18.0
      *
      * @param  PaymentGatewayRegister  $paymentGatewayRegister
diff --git a/src/PaymentGateways/Gateways/PayPalStandard/Actions/CreatePayPalStandardPaymentURL.php b/src/PaymentGateways/Gateways/PayPalStandard/Actions/CreatePayPalStandardPaymentURL.php
index 1d14e71c8f..c9bbfaabeb 100644
--- a/src/PaymentGateways/Gateways/PayPalStandard/Actions/CreatePayPalStandardPaymentURL.php
+++ b/src/PaymentGateways/Gateways/PayPalStandard/Actions/CreatePayPalStandardPaymentURL.php
@@ -93,7 +93,7 @@ private function supportLegacyFilter(array $paypalPaymentArguments, Donation $do
         /**
          * Filter the PayPal Standard redirect args.
          *
-         * @unreleased Create and pass legacy payment data to filter hook
+         * @since 2.21.0 Create and pass legacy payment data to filter hook
          * @since 1.8
          */
         return apply_filters_deprecated(
diff --git a/src/PaymentGateways/Gateways/Stripe/Actions/GetOrCreateStripeCustomer.php b/src/PaymentGateways/Gateways/Stripe/Actions/GetOrCreateStripeCustomer.php
index 24056dd6f2..0b819b114b 100644
--- a/src/PaymentGateways/Gateways/Stripe/Actions/GetOrCreateStripeCustomer.php
+++ b/src/PaymentGateways/Gateways/Stripe/Actions/GetOrCreateStripeCustomer.php
@@ -14,7 +14,7 @@ class GetOrCreateStripeCustomer
     /**
      * @since 2.20.0 add second param support to function.
      *             This param is optional because we use it only when donor subscribe for recurring donation.
-     * @unreleased Update function first argument type to Donation model
+     * @since 2.21.0 Update function first argument type to Donation model
      * @since 2.19.0
      *
      * @throws StripeCustomerException|Exception
@@ -33,7 +33,7 @@ public function __invoke(Donation $donation, string $stripePaymentMethodId = '')
     }
 
     /**
-     * @unreleased Update function first argument type to Donation model
+     * @since 2.21.0 Update function first argument type to Donation model
      * @since 2.19.0
      * @throws Exception
      */
diff --git a/src/PaymentGateways/Gateways/Stripe/Traits/CanSetupStripeApp.php b/src/PaymentGateways/Gateways/Stripe/Traits/CanSetupStripeApp.php
index 967e609917..f92354513c 100644
--- a/src/PaymentGateways/Gateways/Stripe/Traits/CanSetupStripeApp.php
+++ b/src/PaymentGateways/Gateways/Stripe/Traits/CanSetupStripeApp.php
@@ -3,12 +3,12 @@
 namespace Give\PaymentGateways\Gateways\Stripe\Traits;
 
 /**
- * @unreleased
+ * @since 2.21.0
  */
 trait CanSetupStripeApp
 {
     /**
-     * @unreleased
+     * @since 2.21.0
      *
      * @param int $formId
      *
diff --git a/src/PaymentGateways/Gateways/Stripe/Traits/HandlePaymentIntentStatus.php b/src/PaymentGateways/Gateways/Stripe/Traits/HandlePaymentIntentStatus.php
index 7f651650ad..60c76484c5 100644
--- a/src/PaymentGateways/Gateways/Stripe/Traits/HandlePaymentIntentStatus.php
+++ b/src/PaymentGateways/Gateways/Stripe/Traits/HandlePaymentIntentStatus.php
@@ -13,7 +13,7 @@
 trait HandlePaymentIntentStatus
 {
     /**
-     * @unreleased Update second argument type to Donation model
+     * @since 2.21.0 Update second argument type to Donation model
      * @since 2.19.7 fix param order and only pass donationId
      *
      * @return PaymentCommand|RedirectOffsite
diff --git a/src/PaymentGateways/Gateways/Stripe/Webhooks/Contracts/EventListener.php b/src/PaymentGateways/Gateways/Stripe/Webhooks/Contracts/EventListener.php
index 8ca856a4cc..d7bc146f39 100644
--- a/src/PaymentGateways/Gateways/Stripe/Webhooks/Contracts/EventListener.php
+++ b/src/PaymentGateways/Gateways/Stripe/Webhooks/Contracts/EventListener.php
@@ -5,12 +5,12 @@
 use Stripe\Event;
 
 /**
- * @unreleased
+ * @since 2.21.0
  */
 interface EventListener
 {
     /**
-     * @unreleased
+     * @since 2.21.0
      *
      * @return void
      */
diff --git a/src/PaymentGateways/Gateways/Stripe/Webhooks/Listeners/ChargeRefunded.php b/src/PaymentGateways/Gateways/Stripe/Webhooks/Listeners/ChargeRefunded.php
index 6daee75dd4..fd9f3936f6 100644
--- a/src/PaymentGateways/Gateways/Stripe/Webhooks/Listeners/ChargeRefunded.php
+++ b/src/PaymentGateways/Gateways/Stripe/Webhooks/Listeners/ChargeRefunded.php
@@ -9,12 +9,12 @@
 use Stripe\Event;
 
 /**
- * @unreleased
+ * @since 2.21.0
  */
 class ChargeRefunded extends StripeEventListener
 {
     /**
-     * @unreleased
+     * @since 2.21.0
      *
      * @inerhitDoc
      */
@@ -37,7 +37,7 @@ public function processEvent(Event $event)
     }
 
     /**
-     * @unreleased
+     * @since 2.21.0
      */
     private function addSupportForLegacyActionHook(Event $event)
     {
@@ -50,7 +50,7 @@ private function addSupportForLegacyActionHook(Event $event)
     }
 
     /**
-     * @unreleased
+     * @since 2.21.0
      * @inerhitDoc
      */
     protected function getDonation(Event $event)
diff --git a/src/PaymentGateways/Gateways/Stripe/Webhooks/Listeners/CheckoutSessionCompleted.php b/src/PaymentGateways/Gateways/Stripe/Webhooks/Listeners/CheckoutSessionCompleted.php
index 8b0dccad4d..42555fd86c 100644
--- a/src/PaymentGateways/Gateways/Stripe/Webhooks/Listeners/CheckoutSessionCompleted.php
+++ b/src/PaymentGateways/Gateways/Stripe/Webhooks/Listeners/CheckoutSessionCompleted.php
@@ -10,13 +10,13 @@
 use Stripe\Event;
 
 /**
- * @unreleased
+ * @since 2.21.0
  */
 class CheckoutSessionCompleted extends StripeEventListener
 {
 
     /**
-     * @unreleased
+     * @since 2.21.0
      *
      * @inerhitDoc
      */
@@ -36,7 +36,7 @@ public function processEvent(Event $event)
     }
 
     /**
-     * @unreleased
+     * @since 2.21.0
      * @return void
      */
     private function addSupportForLegacyActionHook($donationId, $event)
diff --git a/src/PaymentGateways/Gateways/Stripe/Webhooks/Listeners/PaymentIntentPaymentFailed.php b/src/PaymentGateways/Gateways/Stripe/Webhooks/Listeners/PaymentIntentPaymentFailed.php
index 0d97460b13..6788386319 100644
--- a/src/PaymentGateways/Gateways/Stripe/Webhooks/Listeners/PaymentIntentPaymentFailed.php
+++ b/src/PaymentGateways/Gateways/Stripe/Webhooks/Listeners/PaymentIntentPaymentFailed.php
@@ -10,7 +10,7 @@ class PaymentIntentPaymentFailed extends StripeEventListener
 {
 
     /**
-     * @unreleased
+     * @since 2.21.0
      *
      * @inerhitDoc
      */
@@ -29,7 +29,7 @@ public function processEvent(Event $event)
     }
 
     /**
-     * @unreleased
+     * @since 2.21.0
      */
     private function addSupportForLegacyActionHook(Event $event)
     {
diff --git a/src/PaymentGateways/Gateways/Stripe/Webhooks/Listeners/PaymentIntentSucceeded.php b/src/PaymentGateways/Gateways/Stripe/Webhooks/Listeners/PaymentIntentSucceeded.php
index 43758e3b6e..3efc333261 100644
--- a/src/PaymentGateways/Gateways/Stripe/Webhooks/Listeners/PaymentIntentSucceeded.php
+++ b/src/PaymentGateways/Gateways/Stripe/Webhooks/Listeners/PaymentIntentSucceeded.php
@@ -8,13 +8,13 @@
 use Stripe\PaymentIntent;
 
 /**
- * @unreleased
+ * @since 2.21.0
  */
 class PaymentIntentSucceeded extends StripeEventListener
 {
 
     /**
-     * @unreleased
+     * @since 2.21.0
      * @inerhitDoc
      */
     public function processEvent(Event $event)
@@ -37,7 +37,7 @@ public function processEvent(Event $event)
     }
 
     /**
-     * @unreleased
+     * @since 2.21.0
      */
     private function addSupportForLegacyActionHook(Event $event)
     {
diff --git a/src/PaymentGateways/Gateways/Stripe/Webhooks/StripeEventListener.php b/src/PaymentGateways/Gateways/Stripe/Webhooks/StripeEventListener.php
index 1d31cd1fda..dc19083dc7 100644
--- a/src/PaymentGateways/Gateways/Stripe/Webhooks/StripeEventListener.php
+++ b/src/PaymentGateways/Gateways/Stripe/Webhooks/StripeEventListener.php
@@ -10,14 +10,14 @@
 use Stripe\Event;
 
 /**
- * @unreleased
+ * @since 2.21.0
  */
 abstract class StripeEventListener implements EventListener
 {
     use CanSetupStripeApp;
 
     /**
-     * @unreleased
+     * @since 2.21.0
      * @throws Exception
      */
     public function __invoke(Event $event)
@@ -31,7 +31,7 @@ public function __invoke(Event $event)
     }
 
     /**
-     * @unreleased
+     * @since 2.21.0
      *
      * @param string $eventId
      *
@@ -48,7 +48,7 @@ protected function getEventFromStripe($eventId)
     }
 
     /**
-     * @unreleased
+     * @since 2.21.0
      * @return void
      */
     private function logEventReceiveTime()
@@ -58,7 +58,7 @@ private function logEventReceiveTime()
     }
 
     /**
-     * @unreleased
+     * @since 2.21.0
      *
      * @return int|null
      */
@@ -72,7 +72,7 @@ protected function getFormId(Event $event)
     }
 
     /**
-     * @unreleased
+     * @since 2.21.0
      *
      * @return Donation
      */
diff --git a/src/PaymentGateways/Gateways/TestGateway/TestGatewayOffsite.php b/src/PaymentGateways/Gateways/TestGateway/TestGatewayOffsite.php
index 4ce1b76d69..574655c85e 100644
--- a/src/PaymentGateways/Gateways/TestGateway/TestGatewayOffsite.php
+++ b/src/PaymentGateways/Gateways/TestGateway/TestGatewayOffsite.php
@@ -99,7 +99,7 @@ public function createPayment(Donation $donation)
     /**
      * An example of using a routeMethod for extending the Gateway API to handle a redirect.
      *
-     * @unreleased update to use Donation model
+     * @since 2.21.0 update to use Donation model
      * @since 2.19.0
      *
      * @param  array  $queryParams
@@ -120,7 +120,7 @@ protected function returnFromOffsiteRedirect(array $queryParams): RedirectRespon
     /**
      * An example of using a secureRouteMethod for extending the Gateway API to handle a redirect.
      *
-     * @unreleased update to use Donation model
+     * @since 2.21.0 update to use Donation model
      * @since 2.19.0
      *
      * @param  array  $queryParams
diff --git a/src/Subscriptions/Repositories/SubscriptionRepository.php b/src/Subscriptions/Repositories/SubscriptionRepository.php
index 2bbec16bdb..9da3c21a0a 100644
--- a/src/Subscriptions/Repositories/SubscriptionRepository.php
+++ b/src/Subscriptions/Repositories/SubscriptionRepository.php
@@ -40,7 +40,7 @@ public function getById(int $subscriptionId)
     }
 
     /**
-     * @unreleased
+     * @since 2.21.0
      *
      * @param string $gatewayTransactionId
      *
@@ -64,7 +64,7 @@ public function queryById(int $subscriptionId): ModelQueryBuilder
     }
 
     /**
-     * @unreleased
+     * @since 2.21.0
      *
      * @param string $gatewayTransactionId
      *
@@ -125,7 +125,7 @@ public function getNotesBySubscriptionId(int $id): array
     }
 
     /**
-     * @unreleased replace actions with givewp_subscription_creating and givewp_subscription_created
+     * @since 2.21.0 replace actions with givewp_subscription_creating and givewp_subscription_created
      * @since 2.19.6
      *
      * @return void
@@ -179,7 +179,7 @@ public function insert(Subscription $subscription)
     }
 
     /**
-     * @unreleased replace actions with givewp_subscription_updating and givewp_subscription_updated
+     * @since 2.21.0 replace actions with givewp_subscription_updating and givewp_subscription_updated
      * @since 2.19.6
      *
      * @return void
@@ -223,7 +223,7 @@ public function update(Subscription $subscription)
     }
 
     /**
-     * @unreleased replace actions with givewp_subscription_deleting and givewp_subscription_deleted
+     * @since 2.21.0 replace actions with givewp_subscription_deleting and givewp_subscription_deleted
      * @since 2.20.0 consolidate meta deletion into a single query
      * @since 2.19.6
      *