#104671[DOCS] Resolve merge conflicts for V11.5
Description
Releases: 11.5
This issue was automatically created from https://github.com/TYPO3/typo3/pull/517
Releases: 11.5
This issue was automatically created from https://github.com/TYPO3/typo3/pull/517