[5.0] Upmerge 4.4#42137

HLeithner merged 2 commits intojoomla:5.0-devjoomla/joomla-cms:5.0-devfrom

HLeithner:5.0/upmerge/231014HLeithner/joomla-cms:5.0/upmerge/231014Copy head branch name to clipboard