Pull Request resolves # .

• I read the Generative AI policy and my contribution is either not created with the help of AI or is compatible with the policy and GNU/GPL 2 or later.

Summary of Changes

Merge up latest changes from 5.4-dev since the last upmerge 2 days ago.

The conflicts for the langmetadata.xml files from the translation PRs and the phpstan-baseline.neon from the phpstan fixes in both branches have been solved by keeping the 6.1-dev files.

After that, the only remaining change is the one from PR #48274 .

After the upmerge, people can download the administrator/components/com_templates/src/Model/TemplateModel.php file from the 6.1-dev branch to fix issue #48273 on their 6.1.3, and for those who cannot upload files we can link to the changes of this PR here so they know what to do in an editor.

We could add that to the FAQ documentation.

Testing Instructions

Review. Check the commits of this PR and compare the 6.1-dev branch with the 5.4-dev branch.

Actual result BEFORE applying this Pull Request

6.1-dev branch is 3 commits behind 5.4-dev.

See 6.1-dev...5.4-dev .

Expected result AFTER applying this Pull Request

The branch of this PR is up to date with 5.4-dev.

This PR has the 4 commits as shown with the comparison mentioned in the previous section plus the one merge commit at the end.

The changes in the langmetadata.xml files and the phpstan-baseline.neon have been ignored.

The only remaining change is the one from PR #48274 .

Link to documentations

Please select:

• Documentation link for guide.joomla.org:

• No documentation changes for guide.joomla.org needed

• Pull Request link for manual.joomla.org:

• No documentation changes for manual.joomla.org needed