* **_Upgrader_: Upgrader crashes when migrating some smart groups ([dev/core#2550](https://lab.civicrm.org/dev/core/-/issues/2550): [#21997](https://github.com/civicrm/civicrm-core/pull/21997))**
* **_Maps_: Map link displays critical error ([dev/core#2942](https://lab.civicrm.org/dev/core/-/issues/2942): [#21980](https://github.com/civicrm/civicrm-core/pull/21980))**
* **_CiviEvent_: `{event.*}` tokens do not render in PDFs for participants ([dev/core#2947](https://lab.civicrm.org/dev/core/-/issues/2947): [#22046](https://github.com/civicrm/civicrm-core/pull/22046))**
+* **_APIv4_: Fix failure when joining unusual custom-field-sets. ([dev/mail#103](https://lab.civicrm.org/dev/mail/-/issues/103): [#22051](https://github.com/civicrm/civicrm-core/pull/22051))**
+
+ Note: This bug manifested as a crash when loading CiviMail tokens via APIv4. It only affects custom-field-sets where the _internal machine name_ is unusual.
## <a name="credits"></a>Credits
This release was developed by the following authors and reviewers:
-Wikimedia Foundation - Eileen McNaughton; PeaceWorks Technology Solutions - Martin Hansen;
-JMA Consulting - Monish Deb, Seamus Lee; CiviCRM - Coleman Watts, Tim Otten; @treasurer
+Wikimedia Foundation - Eileen McNaughton; PeaceWorks Technology Solutions - Martin Hansen; JMA Consulting - Monish Deb,
+Seamus Lee; Dave D; Coop SymbioTIC - Mathieu Lutfy; CiviCRM - Coleman Watts, Tim Otten; lishaw1968; @treasurer
## <a name="feedback"></a>Feedback