[TASK] Sync CMS Fluid with Flow Fluid 1.1 (part2)

This is the second part of a backport fluid from Flow.

Change-Id: I96e47131414c50801ff7628508dc05d7d7b5e106
Releases: 6.1
Resolves: #44819
Fixes: #45985
Reviewed-on: https://review.typo3.org/18163
Reviewed-by: Wouter Wolters
Tested-by: Wouter Wolters
Reviewed-by: Marc Bastian Heinrichs
Tested-by: Marc Bastian Heinrichs