Merge branch '5.48' to master

diff --cc CRM/Contact/BAO/Contact.php
Simple merge

diff --cc CRM/Core/Block.php
Simple merge

diff --cc ext/afform/admin/Civi/Api4/Action/Afform/LoadAdminData.php
Simple merge

diff --cc ext/afform/admin/ang/afGuiEditor/afGuiEditor.component.js
index a7b93544d850bd8e71475a189d6133eecb489cb3,c83a1575faa2b8c3707c710eb6aefaf7961cc697..f99ca046899b34f1f56069a344d376ee7a60afe3
--- 1/ext/afform/admin/ang/afGuiEditor/afGuiEditor.component.js
--- 2/ext/afform/admin/ang/afGuiEditor/afGuiEditor.component.js
+++ b/ext/afform/admin/ang/afGuiEditor/afGuiEditor.component.js
@@@ -74,12 -73,10 +74,12 @@@
              editor.layout['#children'].push(afGui.meta.elements.submit.element);
            }
          }
 -
 -        else if (editor.getFormType() === 'block') {
 +        else {
            editor.layout['#children'] = editor.afform.layout;
-           editor.blockEntity = editor.afform.join_entity || editor.afform.entity_type;
 +        }
 +
 +        if (editor.getFormType() === 'block') {
+           editor.blockEntity = editor.afform.join_entity || editor.afform.entity_type || '*';
            $scope.entities[editor.blockEntity] = backfillEntityDefaults({
              type: editor.blockEntity,
              name: editor.blockEntity,

diff --cc templates/CRM/common/TabHeader.js
Simple merge