diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 9aceb79e81cad..50b6393e5c76d 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -14,12 +14,12 @@ If it is a PR, include what the issue is, what the PR is addressing, testing ins
Please be patient as not all items will be tested immediately (remember, all bug testing for the Joomla! CMS is done by volunteers) and be receptive to feedback about your code.
#### Branches
-PRs should usually be made to the `4.2-dev` branch as this contains the most recent version of the code.
+PRs should usually be made to the `4.3-dev` branch as this contains the most recent version of the code.
There are other branches available which serve specific purposes.
| Branch | Purpose |
| ------ | ------- |
| 3.10-dev | Branch for the Joomla 3.x series. The 3.10 series release will now only include security patches. |
-| 4.2-dev | Branch for the current minor Joomla version.|
-| 4.3-dev | Branch for the next minor Joomla version. New features go into this branch. Commits to 4.2-dev will be applied to this branch as well. |
-| 5.0-dev | Branch for the next major Joomla version. |
+| 4.3-dev | Branch for the current minor Joomla version.|
+| 4.4-dev | Branch for the next minor Joomla version. Commits to 4.3-dev will be applied to this branch as well. |
+| 5.0-dev | Branch for the next major Joomla version. New features go into this branch. |
diff --git a/administrator/components/com_content/forms/filter_featured.xml b/administrator/components/com_content/forms/filter_featured.xml
index 61b0090510c7e..2ca56d5d7f2b6 100644
--- a/administrator/components/com_content/forms/filter_featured.xml
+++ b/administrator/components/com_content/forms/filter_featured.xml
@@ -16,7 +16,7 @@
label="JOPTION_SELECT_STAGE"
class="js-select-submit-on-change"
activeonly="true"
- extension="com_content"
+ extension="com_content.article"
>
diff --git a/administrator/components/com_fields/tmpl/fields/default.php b/administrator/components/com_fields/tmpl/fields/default.php
index e0f5c4c72062c..3778dceca1968 100644
--- a/administrator/components/com_fields/tmpl/fields/default.php
+++ b/administrator/components/com_fields/tmpl/fields/default.php
@@ -198,7 +198,7 @@
pagination->getListFooter(); ?>
-
+
authorise('core.create', $component)
diff --git a/administrator/components/com_fields/tmpl/groups/default.php b/administrator/components/com_fields/tmpl/groups/default.php
index 1bde8e30eb335..f9b5bcd3360ba 100644
--- a/administrator/components/com_fields/tmpl/groups/default.php
+++ b/administrator/components/com_fields/tmpl/groups/default.php
@@ -166,7 +166,7 @@
pagination->getListFooter(); ?>
-
+
authorise('core.create', $component)
diff --git a/administrator/components/com_templates/src/Model/TemplateModel.php b/administrator/components/com_templates/src/Model/TemplateModel.php
index 52d8295b29d35..bd86cd9cfc55c 100644
--- a/administrator/components/com_templates/src/Model/TemplateModel.php
+++ b/administrator/components/com_templates/src/Model/TemplateModel.php
@@ -959,7 +959,7 @@ public function save($data)
$data['source'] = str_replace(["\r\n", "\r"], "\n", $data['source']);
// If the asset file for the template ensure we have valid template so we don't instantly destroy it
- if ($fileName === '/joomla.asset.json' && json_decode($data['source']) === null) {
+ if (str_ends_with($fileName, '/joomla.asset.json') && json_decode($data['source']) === null) {
$this->setError(Text::_('COM_TEMPLATES_ERROR_ASSET_FILE_INVALID_JSON'));
return false;
diff --git a/administrator/modules/mod_guidedtours/tmpl/default.php b/administrator/modules/mod_guidedtours/tmpl/default.php
index 3a8c84d790d2b..35bd48ae286a9 100644
--- a/administrator/modules/mod_guidedtours/tmpl/default.php
+++ b/administrator/modules/mod_guidedtours/tmpl/default.php
@@ -25,16 +25,16 @@
->getWebAssetManager()
->useScript('bootstrap.dropdown');
-$lang = $app->getLanguage();
-
-$extension = $app->getInput()->get('option');
-
-$listTours = [];
-$allTours = [];
+$lang = $app->getLanguage();
+$extension = $app->getInput()->get('option');
+$listTours = [];
+$allTours = [];
+$toursCount = $params->get('tourscount', 7);
foreach ($tours as $tour) :
- if (count(array_intersect(['*', $extension], $tour->extensions))) :
+ if ($toursCount > 0 && count(array_intersect(['*', $extension], $tour->extensions))) :
$listTours[] = $tour;
+ $toursCount--;
endif;
$uri = new Uri($tour->url);
@@ -64,10 +64,7 @@